testargs.l testarray.l @@ -6,33 +6,22 @@ parser: parser.o runtime.o parser.o: parser.s -parser.s: parser.rb - ruby parser.rb >parser.s - - -parser2: parser2.o runtime.o - -parser2.o: parser2.s - -parser2.s: parser2.rb parser - ruby parser2.rb >parser2.s - -parser2.rb: parser.l parser - @./parser <parser.l >parser2.rb +parser.s: parser.l + ruby compiler.rb <parser.l >parser.s clean: - @rm -f *~ *.o *.s parser parser2 + @rm -f *~ *.o *.s parser testarray testargs -testarray.s: testarray.rb - ruby testarray.rb >testarray.s +testarray.s: testarray.l + ruby compiler.rb <testarray.l >testarray.s testarray.o: testarray.s testarray: testarray.o runtime.o gcc -o testarray testarray.o runtime.o -testargs.s: testargs.rb - ruby testargs.rb >testargs.s +testargs.s: testargs.l + ruby compiler.rb <testargs.l >testargs.s testargs.o: testargs.s Makefile @@ -1,6 +1,7 @@ #!/bin/env ruby require 'emitter' +require 'sexp' DO_BEFORE= [ [:defun, :array, [:size],[:malloc,[:mul,:size,4]]] @@ -259,3 +260,19 @@ class Compiler end end +s = Scanner.new(STDIN) +prog = nil + +begin + prog = SEXParser.new(s).parse +rescue Exception => e + STDERR.puts "#{e.message}" + STDERR.puts "Failed before:\n" + buf = "" + while s.peek && buf.size < 100 + buf += s.get + end + STDERR.puts buf +end + +Compiler.new.compile(prog) if prog compiler.rb @@ -30,21 +30,9 @@ class SEXParser end def parse_exp + ws (ret = @s.expect(Atom) || @s.expect(Int) || @s.expect(Quoted) || parse_sexp) && ws return ret end end -s = Scanner.new(STDIN) - -begin - PP.pp SEXParser.new(s).parse -rescue Exception => e - PP.pp e - buf = "" - while s.peek - buf += s.get - end - puts buf -end - sexp.rb parser.rb testargs.rb testarray.rb 40801c6e5b77db3a32d39368b1adfdc88fc70bdc Vidar Hokstad vidar@hokstad.com http://github.com/vidarh/writing-a-compiler-in-ruby/commit/5484cf8581d1d0d0ff1b21f129f3d031da0d568a 5484cf8581d1d0d0ff1b21f129f3d031da0d568a 2009-02-14T04:34:00-08:00 2009-02-14T04:34:00-08:00 Converted test programs to the 'lisp like' s-expression syntax; Made the compiler driver use the s-expression parser as a frontend aae65dcb34c04d835fe6de32c8005187a413bf68 Vidar Hokstad vidar@hokstad.com