261c261
< "decl : MACHINE '(' idents ')' ':' params '{' decls '}'"
---
> "decl : MACHINE '(' idents ')' ':' obj_decls '{' decls '}'"
265c265
< "decl : MACHINE '(' idents pairs ')' ':' params '{' decls '}'"
---
> "decl : MACHINE '(' idents pairs ')' ':' obj_decls '{' decls '}'"
321a322,329
> def p_obj_decls__list(self, p):
> "obj_decls : obj_decl obj_decls"
> p[0] = [ p[1] ] + p[2]
>
> def p_obj_decls__empty(self, p):
> "obj_decls : empty"
> p[0] = []
>
343c351
< p[0] = ast.ObjDeclAST(self, p[1], p[2], p[3], None)
---
> p[0] = ast.ObjDeclAST(self, p[1], p[2], p[3], None, False)
347c355
< p[0] = ast.ObjDeclAST(self, p[1], p[3], p[4], None)
---
> p[0] = ast.ObjDeclAST(self, p[1], p[3], p[4], None, True)
351c359,360
< p[0] = ast.ObjDeclAST(self, p[1], p[2], ast.PairListAST(self), p[4])
---
> p[0] = ast.ObjDeclAST(self, p[1], p[2], ast.PairListAST(self), p[4],
> False)
355c364,365
< p[0] = ast.ObjDeclAST(self, p[1], p[3], ast.PairListAST(self), p[5])
---
> p[0] = ast.ObjDeclAST(self, p[1], p[3], ast.PairListAST(self), p[5],
> True)
429c439
< "param : type STAR ident '=' STRING"
---
> "param : type STAR ident ASSIGN STRING"
433c443
< "param : type ident '=' NUMBER"
---
> "param : type ident ASSIGN NUMBER"
437c447
< "param : type ident '=' LIT_BOOL"
---
> "param : type ident ASSIGN LIT_BOOL"
441c451
< "param : type ident '=' STRING"
---
> "param : type ident ASSIGN STRING"