examples/class.rb @@ -18,6 +18,8 @@ Operators = { "*" => Oper.new(20, :mul, :infix), "/" => Oper.new(20, :div, :infix), + + "." => Oper.new(90, :callm, :infix), "[" => Oper.new(99, :index, :infix), "]" => Oper.new(99, nil, :rp), operators.rb @@ -84,16 +84,27 @@ class Parser < ParserBase exps = zero_or_more(:defexp) vars = deep_collect(exps,Array) {|node| node[0] == :assign ? node[1] : nil} exps = [:let,vars] + exps - raise "Expected expression of 'end'" if !@s.expect("end") + raise "Expected expression or 'end'" if !@s.expect("end") return [:defun, name, args, exps] end def parse_sexp; @sexp.parse; end - # exp ::= ws* (def | sexp) + # class ::= "class" ws* name ws* exp* "end" + def parse_class + return nil if !@s.expect("class") + @s.ws + raise "Expected class name" if !(name = @s.expect(Atom)) + @s.ws + exps = zero_or_more(:exp) + raise "Expected expression or 'end'" if !@s.expect("end") + return [:class,name,exps] + end + + # exp ::= ws* (class | def | sexp) def parse_exp @s.ws - parse_def || parse_sexp || @shunting.parse + parse_class || parse_def || parse_sexp || @shunting.parse end # program ::= exp* ws* parser.rb 068cb642600dca03a611007d674c19dc7b33b749 Vidar Hokstad vidarh vidar@hokstad.com http://github.com/vidarh/writing-a-compiler-in-ruby/commit/b5d5d72eae4dae022be549dd57bfdad4c3d79186 b5d5d72eae4dae022be549dd57bfdad4c3d79186 2009-02-24T11:06:56-08:00 2009-02-24T11:06:56-08:00 Started adding support for parsing 'class' and method calls (preliminary only) 5edd1d5adb1ae84600ea1be9fe85dcc0c6774619 Vidar Hokstad vidarh vidar@hokstad.com