checkpoint commit

diff --git a/dyn.rb b/dyn.rb
index beecb497f6798a82246a1886dd415faf178870fb..cb4aec7c3883d947198a1690230e87f189463e21 100755 (executable)
--- a/dyn.rb
+++ b/dyn.rb
@@ -354,12 +354,7 @@ class CodeGenerator
     @syms = Symtable.new
     @funcs = { toplevel: { freevars: [], code: StringIO.new } }
     @protos = StringIO.new
-    @protos.print "Value "
-    defs.each do |k,v|
-      @syms[k] = :toplevel
-      @protos.print "#{k}, "
-    end
-    @protos.puts "_;"
+    @protos.puts "Value #{defs.keys.join(", ")};"
     exprs.each {|e| emit(e) }
   end
 
@@ -386,7 +381,7 @@ class CodeGenerator
   end
 
   def dump
-    pp @syms
+    #pp @syms
     puts @protos.string
   end
 
@@ -422,12 +417,9 @@ parse = Parser.new("dyn.src")
 defs, exprs = parse.toplevel
 
 # Print the definition prototypes
-print "Value "
-defs.each {|k,v| print "#{k.to_s}, " }
-puts "_;"
-
-puts exprs
+#puts "Value #{defs.keys.join(", ")};"
+#puts exprs
 
 #puts exprs
-#gen = CodeGenerator.new(defs, exprs)
-#gen.dump
+gen = CodeGenerator.new(defs, exprs)
+gen.dump

diff --git a/dyn.src b/dyn.src
index e91d4d0ea32ced0702256cd20fdd4b0f84e8a85f..999310bfeec764e649aec0d224016bf6409b5645 100644 (file)
--- a/dyn.src
+++ b/dyn.src
@@ -6,6 +6,7 @@ false
 123.0
 "foo"
 a = 1
+
 #[1,2,3]
 #{ "foo": 123, 42: 24 }
 #
@@ -27,6 +28,7 @@ a = 1
 ## functions and application
 #println("foo!")
 #print(1,2,3,4,5,6,7,8,9)
+
 foo1 = fun(a)
   println("hi!")
 end