Changeset 33810

Timestamp:

06/06/09 01:33:39 (4 years ago)

Author:

nishio

Message:

make cpp encoder/decoder from python encoder/decoder

Files:

• lang/python/retrograde/cpp_en_decoder.py (modified) (12 diffs)

lang/python/retrograde/cpp_en_decoder.py

@@ -9 +9 @@
         name = self.node_name + suffix
         vname = self.var_name + suffix
-        return ["%s = %s" % (name, vname)]
+        return ["%s = %s;" % (name, vname)]
     
     @staticmethod
@@ -16 +16 @@
         name = self.node_name + suffix
         vname = self.var_name + suffix
-        return ["%s = %s" % (vname, name)]
+        return ["%s = %s;" % (vname, name)]
 
 class Take(object):
@@ -24 +24 @@
         name = self.node_name + suffix
         vname = self.var_name + suffix
-        result = ["%s = %s" % (name, vname)]
+        result = ["%s = %s;" % (name, vname)]
         for c in context[self.res.name]:
-            result.append("if %s < %s: %s -= 1" % (c, vname, name))
+            result.append("if(%s < %s) %s--;" % (c, vname, name))
         context[self.res.name].append(vname)
         return result
@@ -35 +35 @@
         name = self.node_name + suffix
         vname = self.var_name + suffix
-        result = ["%s = %s" % (vname, name)]
+        result = ["%s = %s;" % (vname, name)]
         for c in context[self.res.name]:
-            result.append("if %s <= %s: %s += 1" % (c, vname, vname))
+            result.append("if(%s <= %s) %s++;" % (c, vname, vname))
         context[self.res.name].append(vname)
         return result
@@ -50 +50 @@
         c1 = deepcopy(context)
         c1["suffix"] = suffix + "_1"
-        result = self.rule.get_python_encoder(c0) + self.rule.get_python_encoder(c1)
+        result = self.rule.get_cpp_encoder(c0) + self.rule.get_cpp_encoder(c1)
         name = self.get_node_name(context)
         rname0 = self.rule.get_node_name(c0)
         rname1 = self.rule.get_node_name(c1)
         
-        result += ["if %(rname0)s > %(rname1)s: "
-                   "%(rname0)s, %(rname1)s = %(rname1)s, %(rname0)s"
+        result += ["if(%(rname0)s > %(rname1)s) swap(%(rname0)s, %(rname1));"
                    % locals()]
 
@@ -62 +61 @@
         if self.is_repeatable():
             result += [
-                "%(ret)s = %(n)d * %(x)s - %(x)s * (%(x)s - 1) / 2 + %(y)s - %(x)s"
+                "%(ret)s = %(n)d * %(x)s - %(x)s * (%(x)s - 1) / 2 + %(y)s - %(x)s;"
                 % dict(ret=name, x=rname0, y=rname1, n=n)]
         else:
             result += [
-                "%(ret)s = %(n)d * %(x)s - %(x)s * (%(x)s + 1) / 2 + %(y)s - %(x)s"
+                "%(ret)s = %(n)d * %(x)s - %(x)s * (%(x)s + 1) / 2 + %(y)s - %(x)s;"
                 % dict(ret=name, x=rname0, y=rname1, n=n)]
 
@@ -87 +86 @@
         if self.is_repeatable():
             result += [
-                "n = %d" % n,
-                "%s = 0" % rname0,
-                "while %s >= n:" % name,
-                "    %s -= n" % name,
-                "    n -= 1",
-                "    %s += 1" % rname0,
-                "%s = %s + %s" % (rname1, name, rname0),]
+                "n = %d;" % n,
+                "%s = 0;" % rname0,
+                "while(%s >= n){" % name,
+                "    %s -= n;" % name,
+                "    n--;",
+                "    %s++;" % rname0,
+                "}",
+                "%s = %s + %s;" % (rname1, name, rname0),]
         else:
             result += [
-                "n = %d" % (n - 1),
-                "%s = 0" % rname0,
-                "while %s >= n:" % name,
-                "    %s -= n" % name,
-                "    n -= 1",
-                "    %s += 1" % rname0,
-                "%s = %s + %s" % (rname1, name, rname0),]
-
-        result += self.rule.get_python_decoder(c0) 
-        result += self.rule.get_python_decoder(c1)
+                "n = %d;" % (n - 1),
+                "%s = 0;" % rname0,
+                "while(%s >= n){" % name,
+                "    %s -= n;" % name,
+                "    n--;",
+                "    %s++;" % rname0,
+                "}",
+                "%s = %s + %s;" % (rname1, name, rname0),]
+
+        result += self.rule.get_cpp_decoder(c0) 
+        result += self.rule.get_cpp_decoder(c1)
         return result
     
@@ -119 +120 @@
         if self.unorder_info:
             orig_flag = self.unorder_info
-            result += ["%s = not(%s_0 ^ %s_1)" % (vname, orig_flag, orig_flag)]
-
-        result += ["if %s:" % vname]
-        result += utils.indent(self.r2.get_python_encoder(deepcopy(context)))
-        result += ["    %s = %s" % (name, self.r2.get_node_name(context))]
-        result += ["else:"]
-        result += utils.indent(self.r1.get_python_encoder(deepcopy(context)))
-        result += ["    %s = %s + %s" % (
+            result += ["%s = !(%s_0 ^ %s_1);" % (vname, orig_flag, orig_flag)]
+
+        result += ["if(%s){" % vname]
+        result += utils.indent(self.r2.get_cpp_encoder(deepcopy(context)))
+        result += ["    %s = %s;" % (name, self.r2.get_node_name(context))]
+        result += ["}else{"]
+        result += utils.indent(self.r1.get_cpp_encoder(deepcopy(context)))
+        result += ["    %s = %s + %s;" % (
             name, self.r1.get_node_name(context), r2size)]
-
+        result += ["}"]
         return result
 
@@ -140 +141 @@
         if self.unorder_info:
             orig_flag = self.unorder_info
-            result += ["%s_0 = False" % (orig_flag,)]
-
-        result += ["if %s < %d:" % (name, n)]
-        result += ["    %s = True" % (vname, )]
-        result += ["    %s = %s" % (self.r2.get_node_name(context), name)]
-        result += utils.indent(self.r2.get_python_decoder(deepcopy(context)))
-        result += ["else:"]
-        result += ["    %s = False" % (vname, )]
-        result += ["    %s = %s - %d" % (
+            result += ["%s_0 = false;" % (orig_flag,)]
+
+        result += ["if(%s < %d){" % (name, n)]
+        result += ["    %s = true;" % (vname, )]
+        result += ["    %s = %s;" % (self.r2.get_node_name(context), name)]
+        result += utils.indent(self.r2.get_cpp_decoder(deepcopy(context)))
+        result += ["}else{"]
+        result += ["    %s = false;" % (vname, )]
+        result += ["    %s = %s - %d;" % (
             self.r1.get_node_name(context), name, n)]
-        result += utils.indent(self.r1.get_python_decoder(deepcopy(context)))
+        result += utils.indent(self.r1.get_cpp_decoder(deepcopy(context)))
+        result += ["}"]
         if self.unorder_info:
             orig_flag = self.unorder_info
-            result += ["%s_1 = not(%s ^ %s_0)" % (orig_flag, vname, orig_flag)]
+            result += ["%s_1 = !(%s ^ %s_0);" % (orig_flag, vname, orig_flag)]
 
         return result
@@ -169 +171 @@
             oname = self.unordered_info
             # 正規化のコードを入れる
-            result += ["if %s_1:" % oname]
-            for typ, v, com in self.r1.vars:
-                result += utils.indent(["%s = %s_0" % (v, v)])
-            for typ, v, com in self.r2.vars:
-                result += utils.indent(["%s = %s_1" % (v, v)])
-            result += ["else:"]
-            for typ, v, com in self.r1.vars:
-                result += utils.indent(["%s = %s_1" % (v, v)])
-            for typ, v, com in self.r2.vars:
-                result += utils.indent(["%s = %s_0" % (v, v)])
-
-        result += self.r1.get_python_encoder(context) 
-        result += self.r2.get_python_encoder(context)
-        result += ["%s = %s * %s + %s" % (
+            result += ["if(%s_1){" % oname]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s = %s_0;" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s = %s_1;" % (v, v)])
+            result += ["}else{"]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s = %s_1;" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s = %s_0;" % (v, v)])
+            result += ["}"]
+
+        result += self.r1.get_cpp_encoder(context) 
+        result += self.r2.get_cpp_encoder(context)
+        result += ["%s = %s * %s + %s;" % (
             self.get_node_name(context), r1name,
             self.r2.size(copy), r2name)]
@@ -192 +195 @@
         name = self.get_node_name(context)
         result = [
-            "%s = %s / %s" % (
+            "%s = %s / %s;" % (
                 self.r1.get_node_name(context), name, n),
-            "%s = %s %% %s" % (
+            "%s = %s %% %s;" % (
                 self.r2.get_node_name(context), name, n)]
-        result += self.r1.get_python_decoder(context)
-        result += self.r2.get_python_decoder(context)
+        result += self.r1.get_cpp_decoder(context)
+        result += self.r2.get_cpp_decoder(context)
         # 正規化戻しのコードを入れる(foo_? = foo)
         if self.unordered_info:
@@ -203 +206 @@
             r1vname = self.r1.var_name
             r2vname = self.r2.var_name
-            result += ["if %s_0:" % oname]
-            for typ, v, com in self.r1.vars:
-                result += utils.indent(["%s_1 = %s" % (v, v)])
-            for typ, v, com in self.r2.vars:
-                result += utils.indent(["%s_0 = %s" % (v, v)])
-            result += ["else:"]
-            for typ, v, com in self.r1.vars:
-                result += utils.indent(["%s_0 = %s" % (v, v)])
-            for typ, v, com in self.r2.vars:
-                result += utils.indent(["%s_1 = %s" % (v, v)])
-
-        return result
+            result += ["if(%s_0){" % oname]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s_1 = %s;" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s_0 = %s;" % (v, v)])
+            result += ["}else{"]
+            for typ, v, com in self.r1.vars:
+                result += utils.indent(["%s_0 = %s;" % (v, v)])
+            for typ, v, com in self.r2.vars:
+                result += utils.indent(["%s_1 = %s;" % (v, v)])
+
+            result += "}";
+        return result