lcfOS: python/c3/parser.py comparison

pointers

comparison

equal deleted inserted replaced

-:3f6c30a5d234
+:848c4b15fd0b
 e2 = self.Term()
 e = astnodes.Binop(e, op.typ, e2, op.loc)
 return e
 def Term(self):
-t = self.Factor()
+t = self.BitwiseOr()
 while self.Peak in ['*', '/']:
 op = self.Consume(self.Peak)
-t2 = self.Factor()
+t2 = self.BitwiseOr()
 t = astnodes.Binop(t, op.typ, t2, op.loc)
 return t
-def Factor(self):
+def BitwiseOr(self):
-# TODO: eliminate this step?
+a = self.BitwiseAnd()
-return self.CastExpression()
+while self.Peak in ['|']:
+op = self.Consume(self.Peak)
+b = self.BitwiseAnd()
+a = astnodes.Binop(a, op.typ, b, op.loc)
+return a
+def BitwiseAnd(self):
+a = self.CastExpression()
+while self.Peak in ['&']:
+op = self.Consume(self.Peak)
+b = self.CastExpression()
+a = astnodes.Binop(a, op.typ, b, op.loc)
+return a
 # Domain of unary expressions:
 def CastExpression(self):
-# TODO: cast conflicts with '(' expr ')'
+# TODO: cast conflicts with '(' expr ')', so introduce extra keyword 'cast'
-if self.Peak == '(ii':
+if self.Peak == 'cast':
+self.Consume('cast')
+self.Consume('<')
+print('TODO: implement type cast')
+t = self.parseTypeSpec()
+# Type
+self.Consume('>')
 self.Consume('(')
-print('TODO: implement type cast')
+ce = self.CastExpression()
-#rrrrr
-self.parseTypeSpec()
-# Type
 self.Consume(')')
-ce = self.CastExpression()
+# TODO: use type spec here
 return ce
 else:
 return self.UnaryExpression()
 def UnaryExpression(self):

Mercurial > lcfOS