From 9be344551781dd4af9ff90663f6bcc6e9f292f0a Mon Sep 17 00:00:00 2001
From: Mark Thom <markjordanthom@gmail.com>
Date: Mon, 26 Dec 2016 14:09:24 -0700
Subject: [PATCH] cosmetic changes.

---
 src/l0/codegen.rs |  4 +++-
 src/l0/machine.rs | 10 +++++-----
 src/main.rs       |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/l0/codegen.rs b/src/l0/codegen.rs
index 8f50e7b8..d41d8d72 100644
--- a/src/l0/codegen.rs
+++ b/src/l0/codegen.rs
@@ -139,7 +139,9 @@ pub fn compile_fact<'a>(t: &'a Term) -> Program {
     while let Some(t) = queue.pop_front() {
         match t {
             (r, &Term::Clause(ref atom, ref terms)) => {
-                fact.push(MachineInstruction::GetStructure(atom.clone(), terms.len(), r));
+                fact.push(MachineInstruction::GetStructure(atom.clone(),
+                                                           terms.len(),
+                                                           r));
 
                 let mut counter : usize = reg;
 
diff --git a/src/l0/machine.rs b/src/l0/machine.rs
index e507c1f1..b98547ac 100644
--- a/src/l0/machine.rs
+++ b/src/l0/machine.rs
@@ -20,7 +20,7 @@ type Heap = Vec<HeapCell>;
 
 type Registers = Vec<HeapCell>;
 
-pub struct MachineState {
+pub struct Machine {
     h : usize,
     s : usize,
     pub fail : bool,
@@ -30,9 +30,9 @@ pub struct MachineState {
     registers : Registers
 }
 
-impl MachineState {
-    pub fn new() -> MachineState {
-        MachineState { h : 0,
+impl Machine {
+    pub fn new() -> Machine {
+        Machine { h : 0,
                        s : 0,
                        fail : false,
                        heap : Vec::with_capacity(256),
@@ -195,7 +195,7 @@ impl MachineState {
     pub fn reset_heap(&mut self) {
         let program = self.program.take();
 
-        *self = MachineState::new();
+        *self = Machine::new();
         self.program = program;
     }
     
diff --git a/src/main.rs b/src/main.rs
index 294d871a..e405207c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,7 @@ mod l0;
 
 use l0::ast::{Atom, Program, Term, TopLevel, Var};
 use l0::codegen::{compile_fact, compile_query};
-use l0::machine::{MachineState};
+use l0::machine::{Machine};
 
 use std::io::{self, Write};
 
@@ -13,7 +13,7 @@ fn print_instructions(program : &Program) {
 }
 
 fn l0_repl() {
-    let mut ms = MachineState::new();
+    let mut ms = Machine::new();
     
     loop {
         print!("l0> ");
@@ -27,14 +27,14 @@ fn l0_repl() {
         if &*buffer == "quit\n" {
             break;
         } else if &*buffer == "clear\n" {
-            ms = MachineState::new();
+            ms = Machine::new();
         }        
         
         match result {            
             Ok(TopLevel::Fact(fact)) => {                
                 let program = compile_fact(&fact);
                 
-                ms = MachineState::new();                
+                ms = Machine::new();                
                 ms.program = Some(program);                
                 
                 println!("Program stored.");
-- 
2.54.0