diff --git a/fx92/drawing.py b/fx92/drawing.py index 904a314..7048a04 100644 --- a/fx92/drawing.py +++ b/fx92/drawing.py @@ -199,7 +199,7 @@ class Window: """Push window contents on-screen.""" if self.stream: - name = "{:04d}.png".format(self.streamid) + name = "{:04d}.bmp".format(self.streamid) self.save(os.path.join(self.stream, name)) self.streamid += 1 diff --git a/fx92/parser.py b/fx92/parser.py index aa91cff..178a4a6 100644 --- a/fx92/parser.py +++ b/fx92/parser.py @@ -249,7 +249,7 @@ class Parser: e = self.expr() # Allow a parenthesis to be removed at the end of a parameter - optional = (self.la.type == T.PARAM) + optional = (self.la.type in [T.PARAM, T.SEMI]) self.expect(T.RPAR, optional=optional) return Node(N.EXP, a, e) @@ -270,7 +270,7 @@ class Parser: e = self.expr() # Allow a parenthesis to be removed at the end of a parameter - optional = (self.la.type == T.PARAM) + optional = (self.la.type in [T.PARAM, T.SEMI]) self.expect(T.RPAR, optional=optional) return e @@ -279,7 +279,7 @@ class Parser: a = self.funargs() # Allow a parenthesis to be removed at the end of a parameter - optional = (self.la.type == T.PARAM) + optional = (self.la.type in [T.PARAM, T.SEMI]) self.expect(T.RPAR, optional=optional) return Node(N.FUN, name, a)