From 919b5d82c3dfeeec89ecb753d64c703b83c6f156 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 10 Aug 2009 12:06:43 +0200
Subject: [PATCH] Renamed meta files to status files to match the Moe paper

---
 t/moe/batch.py               |  2 +-
 t/moe/eval.py                |  6 +++---
 t/moe/{meta.py => status.py} | 32 ++++++++++++++++----------------
 t/test.py                    |  8 ++++----
 4 files changed, 24 insertions(+), 24 deletions(-)
 rename t/moe/{meta.py => status.py} (76%)

diff --git a/t/moe/batch.py b/t/moe/batch.py
index edb9eef..e4e2394 100644
--- a/t/moe/batch.py
+++ b/t/moe/batch.py
@@ -58,7 +58,7 @@ def locate(e, filename=None):
     e.builtins.set("EXT", norm_ext)
     e.cfgs.apply_overrides("EXT_" + norm_ext)
 
-    e.meta["source"] = file
+    e.stat["source"] = file
     e.log.progress(file + "\n")
 
 def compile(e):
diff --git a/t/moe/eval.py b/t/moe/eval.py
index 3e313f3..3298144 100644
--- a/t/moe/eval.py
+++ b/t/moe/eval.py
@@ -3,7 +3,7 @@
 import moe
 import moe.config
 import moe.log
-import moe.meta
+import moe.stat
 import moe.pipeline
 import moe.batch
 import moe.util
@@ -18,7 +18,7 @@ class Eval:
 	self.builtins = moe.config.MoeConfig(type="builtins")
 	self.cfgs.push(self.builtins)
 	self.main_pipe = moe.pipeline.MoePipeline("main")
-	self.meta = moe.meta.MoeMeta()
+	self.stat = moe.stat.MoeStatus()
 	pass
 
     def init(self, overrides=None):
@@ -63,7 +63,7 @@ class Eval:
 	self.cfgs.push(task_cfg)
 	self.log_config(3, "after loading the task")
 
-	self.meta["task"] = task
+	self.stat["task"] = task
 
 	type = self.cfgs['TASK_TYPE']
 	if type == "batch" or type == "interactive":
diff --git a/t/moe/meta.py b/t/moe/status.py
similarity index 76%
rename from t/moe/meta.py
rename to t/moe/status.py
index 231b8df..936659e 100644
--- a/t/moe/meta.py
+++ b/t/moe/status.py
@@ -6,28 +6,28 @@ import re
 
 key_pattern = re.compile("^[A-Za-z0-9_-]+$")
 
-class MoeMetaInvalid(Exception):
+class MoeStatusInvalid(Exception):
     pass
 
-class MoeMeta:
-    """Moe meta-file."""
+class MoeStatus:
+    """Moe status file."""
 
     def __init__(self):
-        self.meta = {}
+        self.stat = {}
 
     def __getitem__(self, k):
-	if not self.meta.has_key(k): return None
-        v = self.meta[k]
+	if not self.stat.has_key(k): return None
+        v = self.stat[k]
 	if type(v) == types.ListType:
 	    if len(v) > 0: return v[0]
 	    else: return None
 	else: return v
 
     def __setitem__(self, k, v):
-	self.meta[k] = v
+	self.stat[k] = v
 
     def get_list(self, k):
-	m = self.meta
+	m = self.stat
 	if not m.has_key(k):
 	    m[k] = []
 	elif type(m[k]) != types.ListType:
@@ -43,11 +43,11 @@ class MoeMeta:
 	self.write_nested(file, 0)
 
     def write_nested(self, file, indent):
-        for k,v in self.meta.items():
+        for k,v in self.stat.items():
 	    if type(v) == types.ListType: vals = v
 	    else: vals = [v]
 	    for w in vals:
-		if isinstance(w, MoeMeta):
+		if isinstance(w, MoeStatus):
 		    file.write("\t" * indent + k + "(\n")
 		    w.write_nested(file, indent+1);
 		    file.write("\t" * indent + ")\n")
@@ -60,13 +60,13 @@ class MoeMeta:
 		file = open(name, "r")
 	    else:
 		file = sys.stdin
-	self.meta = {}
+	self.stat = {}
 	self.do_read(file)
 
     def read_val(self, k, v):
 	if not key_pattern.match(k):
-	    raise MoeMetaInvalid, "Parse error: invalid key syntax"
-	m = self.meta
+	    raise MoeStatusInvalid, "Parse error: invalid key syntax"
+	m = self.stat
 	if not m.has_key(k):
 	    m[k] = v
 	else:
@@ -87,14 +87,14 @@ class MoeMeta:
 		    this.read_val(k, v)
 		elif x.endswith("("):
 		    k = x[:-1]
-		    new = MoeMeta()
+		    new = MoeStatus()
 		    this.read_val(k, new)
 		    stk.append(this)
 		    this = new
 		elif x == ")":
 		    if len(stk) == 0:
-			raise MoeMetaInvalid, "Parse error: incorrect nesting"
+			raise MoeStatusInvalid, "Parse error: incorrect nesting"
 		    else:
 			this = stk.pop()
 		else:
-		    raise MoeMetaInvalid, "Parse error: malformed line"
+		    raise MoeStatusInvalid, "Parse error: malformed line"
diff --git a/t/test.py b/t/test.py
index b50fed1..167be98 100755
--- a/t/test.py
+++ b/t/test.py
@@ -4,7 +4,7 @@ import sys
 sys.path.append('.')
 
 import moe
-import moe.meta
+import moe.stat
 import moe.config
 import moe.eval
 import moe.pipeline
@@ -34,9 +34,9 @@ except moe.MoeErr, err:
     e.log.shout("FATAL: %s\n" % err)
     sys.exit(1)
 except moe.SolutionErr, err:
-    ## FIXME: In this case, we might write the meta file
+    ## FIXME: In this case, we might write the status file
     e.log.shout("%s\n" % err)
     sys.exit(1)
 
-print "\nFinal meta file:"
-e.meta.write()
+print "\nFinal status file:"
+e.stat.write()
-- 
2.39.2