]> Repositorios git - scryer-prolog.git/commitdiff
correct formatting bugs
authorMark Thom <[email protected]>
Wed, 17 May 2017 22:40:05 +0000 (16:40 -0600)
committerMark Thom <[email protected]>
Wed, 17 May 2017 22:40:05 +0000 (16:40 -0600)
src/prolog/codegen.rs
src/prolog/io.rs

index c9fbd21463b32f41b3a98ae9e09e38bbdc7bd148..0faf24e1b9f092a5595e183727e7e4a729be1743 100644 (file)
@@ -225,7 +225,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
 
         (vs, has_deep_cut)
     }
-    
+
     fn add_conditional_call(compiled_query: &mut Code, term: &Term, pvs: usize)
     {
         match term {
@@ -317,7 +317,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
     }
 
     fn compile_neck_cut_or(&mut self,
-                           p1: &'a TermOrCut,                           
+                           p1: &'a TermOrCut,
                            body: &mut Code,
                            perm_vars: usize,
                            is_exposed: bool,
@@ -359,7 +359,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
             body.insert(dealloc_index, Line::Control(ControlInstruction::Deallocate));
         }
     }
-    
+
     pub fn compile_rule<'b: 'a>(&mut self, rule: &'b Rule) -> Code
     {
         let iter = ChunkedIterator::from_rule(rule);
@@ -483,10 +483,10 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
 
         self.compile_neck_cut_or(p1, &mut code, perm_vars, true, query.len() == 1);
         self.compile_seq(&query[1 .. ], &vs, &mut code, true);
-        
+
         if perm_vars > 0 {
             let index = if let &Line::Control(_) = code.last().unwrap() {
-                code.len() - 2 
+                code.len() - 2
             } else {
                 code.len() - 1
             };
@@ -495,7 +495,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
                 vs.mark_unsafe_vars_in_query(query);
             }
         }
-        
+
         Self::compile_cleanup(&mut code, query.len() - 1, query.last().unwrap());
 
         code
index 12149d49050ee63d0905c71ba9e98ee3079aecc4..911406f6ace6f338f159c34f6b42f218f97f8ce7 100644 (file)
@@ -306,14 +306,16 @@ pub fn print(wam: &mut Machine, result: EvalSession) {
         EvalSession::InitialQuerySuccess(alloc_locs, mut heap_locs) => {
             print!("true");
 
-            if !wam.or_stack_is_empty() {
-                print!(" ");                    
-            }
-            
-            println!(".");
-            
             if heap_locs.is_empty() {
+                if !wam.or_stack_is_empty() {
+                    print!(" ");
+                }
+
+                println!(".");
+
                 return;
+            } else {
+                println!("");
             }
 
             loop {
@@ -349,7 +351,7 @@ pub fn print(wam: &mut Machine, result: EvalSession) {
                         stdout.flush().unwrap();
                         return;
                     }
-                } else {                    
+                } else {
                     break;
                 }
             }