@@ -1,8 +1,20 @@ # Simple test... def test() - x = "ohaie" - printf(x) + x = 1 + y = "ohaie" + printf("%d, %s", x, y) end +def input() + buf = " " + read(0, buf, 1) + puts(buf) +end + +puts("== test") test() +puts("== input") +input() +puts("== exit") +exit(7) \ No newline at end of file example/simple.or @@ -34,8 +34,7 @@ module Orange end def assign(name, value) - # HACK assume *char for now - ptr = @entry_block.alloca(PCHAR, 0) + ptr = @entry_block.alloca(value_type(value), 0) @entry_block.store(value, ptr) @locals[name] = ptr end @@ -75,6 +74,14 @@ module Orange private def define_external_functions @module.external_function("printf", Type.function(INT, [PCHAR], true)) + @module.external_function("puts", Type.function(INT, [PCHAR])) + @module.external_function("read", Type.function(INT, [INT, PCHAR, INT])) + @module.external_function("exit", Type.function(INT, [INT])) + end + + TYPE_MAPPING = { 11 => PCHAR, 7 => INT } + def value_type(value) + TYPE_MAPPING[value.type.type_id] end end end @@ -83,9 +90,11 @@ if __FILE__ == $PROGRAM_NAME g = Orange::Generator.new g.preamble g.function("test") do |gf| - str = gf.new_string("ohaie\n") + str = gf.new_string(">> %d\n") + num = gf.new_number(7) gf.assign("x", str) - gf.call("printf", gf.load("x")) + gf.assign("y", num) + gf.call("printf", gf.load("x"), gf.load("y")) end g.call("test") g.finish lib/orange/generator.rb @@ -26,7 +26,7 @@ describe Orange::Generator do @generator.run end - it "should call assign var" do + it "should call assign string var" do str = @generator.new_string("") @generator.assign("x", str) @generator.call("printf", @generator.load("x")) @@ -37,4 +37,16 @@ describe Orange::Generator do "load i8**") @generator.run end + + it "should call assign numeric var" do + num = @generator.new_number(7) + @generator.assign("x", num) + @generator.call("printf", @generator.new_string("%d"), @generator.load("x")) + @generator.finish + + @generator.inspect.should include("alloca", + "store i32 7", + "load i32") + @generator.run + end end \ No newline at end of file spec/generator_spec.rb 35e4c43ed104b0d0258318f517d4e874ad05c81b macournoyer macournoyer@gmail.com http://github.com/macournoyer/orange/commit/48b8c83a080c57899ecd79b895c2efe32fa43f21 48b8c83a080c57899ecd79b895c2efe32fa43f21 2008-10-28T20:07:42-07:00 2008-10-28T20:07:42-07:00 Implement code generation for numbers, kind of a hack to guess the type of var... 3684d914c8b7e537c4b4990e262eb34db300bc3d macournoyer macournoyer@gmail.com