Changeset 3947

Timestamp:

Aug 2, 2014, 1:09:52 PM (5 years ago)

Author:

cameron

Message:

Rename bitwise-expr to pablo-expr;add advance expression, pablo-stmt

Location:

proto/charsetcompiler

Files:

• CC_compiler.py (modified) (1 diff)
• charset_compiler.py (modified) (1 diff)
• charset_compiler2.py (modified) (3 diffs)
• pablo_expr.py (moved) (moved from proto/charsetcompiler/bitwise_expr.py) (3 diffs)
• pablo_stmt.py (added)

proto/charsetcompiler/CC_compiler.py

@@ -7 +7 @@
 Encoding_Type = UTF_encoding.UTF_Encoding_Type
 
-from bitwise_expr import *
+from pablo_expr import *
 
 class CC_compiler():

proto/charsetcompiler/charset_compiler.py

@@ -37 +37 @@
 Encoding_Type = UTF_encoding.UTF_Encoding_Type
 
-from bitwise_expr import *
+from pablo_expr import *
 from CC_compiler import *
 

proto/charsetcompiler/charset_compiler2.py

@@ -42 +42 @@
 import charset_input_parser
 
-from bitwise_expr import *
+import UTF_encoding
+Encoding_Type = UTF_encoding.UTF_Encoding_Type
+
+from pablo_expr import *
 
 def bit_var(n):
@@ -371 +374 @@
     # Option definition
     option_parser = optparse.OptionParser(usage='python %prog [options] <input file>', version='0.8')
-
+ 
+    option_parser.add_option('-u', '--character_encoding',
+                             dest='character_encoding',
+                             type='string',
+                             default='Default',
+                             help='character encoding; default: UTF-8',
+                             )  
     option_parser.add_option('-b', '--basis_pattern', 
                              dest='basis_pattern',
@@ -378 +387 @@
                              help='pattern for basis bit streams; default: basis_bits.bit_%i',
                              )
+    option_parser.add_option('-l', '--little_endian',
+                             dest='little_endian',
+                             action='store_true',
+                             default=False,
+                             help='sets bit numbering of the output to little-endian',
+                             )
     option_parser.add_option('-g', '--gensym_pattern', 
                              dest='gensym_pattern',

proto/charsetcompiler/pablo_expr.py

@@ -1 +1 @@
 #
-#  Bitwise Boolean Expressions.
+#  Pablo Expressions:  bitwise Boolean Expressions + Advance.
 #
 import ast
@@ -62 +62 @@
     def __str__(self): return 'Sel(%s, %s, %s)' % (self.sel.__str__(), self.true_branch.__str__(), self.false_branch.__str__())
     def toAST(self): return ast.IfExpr(self.sel.toAST(), self.true_branch.toAST(), self.false_branch.toAST())
+
+class Adv(BitwiseExpr):
+    def __init__(self, expr, n):
+        self.operand = expr
+        self.offset = n
+    def __str__(self): return 'Advance(%s, %i)' % (self.operand.__str__(), self.offset)
+    def toAST(self): return ast.Call(ast.Attribute(ast.Name('pablo', ast.Load()), 'Advance', ast.Load()), [self.operand.toAST(), ast.Num(self.offset)])
+
+
 
 
@@ -200 +209 @@
              else: return False
         else: return False
-
-
+    elif isinstance(e1, Adv) and isinstance(e2, Adv):
+        if e1.offset == e2.offset: return equal_exprs(e1.operand(), e2.operand())
+        else: return False
+    else: return False
+