diff -r ce43c04d227d -r d94755882e36 ProgTutorial/Solutions.thy --- a/ProgTutorial/Solutions.thy Mon May 24 20:02:11 2010 +0100 +++ b/ProgTutorial/Solutions.thy Thu May 27 10:39:07 2010 +0200 @@ -90,13 +90,13 @@ | Add of expr * expr fun parse_basic xs = - (OuterParse.nat >> Number - || OuterParse.$$$ "(" |-- parse_expr --| OuterParse.$$$ ")") xs + (Parse.nat >> Number + || Parse.$$$ "(" |-- parse_expr --| Parse.$$$ ")") xs and parse_factor xs = - (parse_basic --| OuterParse.$$$ "*" -- parse_factor >> Mult + (parse_basic --| Parse.$$$ "*" -- parse_factor >> Mult || parse_basic) xs and parse_expr xs = - (parse_factor --| OuterParse.$$$ "+" -- parse_expr >> Add + (parse_factor --| Parse.$$$ "+" -- parse_expr >> Add || parse_factor) xs*}