robolson-simplesem 0.1.2 → 0.1.3

data/README.textile

@@ -6,7 +6,7 @@ h2. Description
 
 Interpreter for the SIMPLESEM language.
 
-SIMPLESEM is used in the CS141 Programming Languages course taught by Professor "Shannon Tauro":http://www.ics.uci.edu/~stauro/ at UC Irvine. This Rubygem was created out of my desire to execute SIMPLESEM programs. To my knowledge, there are none publicly available.
+SIMPLESEM is used in the CS141 Programming Languages course taught by Professor "Shannon Tauro":http://www.ics.uci.edu/~stauro/ at UC Irvine. This Rubygem was created out of my desire to execute SIMPLESEM programs.
 
 This interpreter utilizes Nathan Sobo's "Treetop":http://github.com/nathansobo/treetop gem to create a parsing expression grammar for parsing SIMPLESEM commands.  
 
@@ -20,6 +20,16 @@ Execute a SIMPLESEM program using the simplesem command. Pass the filename of th
 
   $ simplesem simplesem_file.txt
 
+h3. Command Line Options
+
+The simplesem executable accepts a couple command line options which will display the values in the Data array at the time the program exits.
+
+  -h    Print help message
+  -t    Print Data array on exit
+  -v    Print Data array with change history on exit. Supersedes -t if it is also specified.
+
+Use -t if you only want to see the ending value at each position in the Data array, otherwise use -v to see each data location's history. If neither -t or -v is used the program will not display the data array.
+
 h2. Introduction to SIMPLESEM
 
 SIMPLESEM is an abstract semantic processor that is based on the Von Neumann model of the fetch-execute cycle.
@@ -127,11 +137,14 @@ jump 8
 </code></pre>
 
 <pre>
-$ simplesem sample_programs/gcd.txt 
+$ simplesem -v sample_programs/gcd.txt 
 input: 15
 input: 35
 5
 
-DATA: [5, 5, 4]
+DATA: 
+0: [15, 10, 5]
+1: [35, 20, 5]
+2: [4]
 </pre>
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('simplesem', '0.1.2') do |p|
+Echoe.new('simplesem', '0.1.3') do |p|
   p.description         = "SIMPLESEM Interpreter"
   p.url                 = "http://github.com/robolson/simplesem"
   p.author              = "Rob Olson"

data/bin/simplesem

@@ -1,15 +1,55 @@
 #!/usr/bin/env ruby
+#= Overview
+#
+# Interpreter for the SIMPLESEM language
+#
+#= Usage
+#
+# simplesem [-t|-v] filename
+# 
+# Options:
+#   -h    Print this message
+#   -t    Print Data array on exit
+#   -v    Print Data array with change history on exit. Supersedes -t 
+#         if it is also specified.
+#
+
 require 'rubygems'
+require 'rdoc/usage'
+require 'getoptlong'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'simplesem'
 
-if ARGV.empty?
-  puts "Usage:\n\nsimplesem simplesem_file.txt\n\n"
-  exit
+opts = GetoptLong.new(
+  [ '-h', '--help', GetoptLong::NO_ARGUMENT ],
+  [ '-t', GetoptLong::NO_ARGUMENT ],
+  [ '-v', GetoptLong::NO_ARGUMENT ]
+)
+
+verbosity = 0   # by default do not print what is in Data
+
+opts.each do |opt, arg|
+  case opt
+    when '-h'
+      RDoc::usage
+    when '-t'
+      verbosity = 1
+    when '-v'
+      verbosity = 2
+  end
+end
+
+if ARGV.length != 1
+  puts "Missing filename argument (try --help)"
+  exit 0
 end
 
 ssp = SimpleSemProgram.new(ARGV.shift)
 ssp.run
 
-puts "\nDATA: " + ssp.data.inspect
+if (verbosity == 1)
+  puts "\nDATA: \n" + ssp.inspect_data
+elsif (verbosity == 2)
+  puts "\nDATA: \n" + ssp.inspect_data_with_history
+end

data/lib/simplesem/simple_sem.treetop

@@ -20,7 +20,13 @@ grammar SimpleSem
   rule set_stmt_assign
     'set' space loc:additive comma value:additive {
       def execute(env)
-        env.data[loc.eval(env)] = value.eval(env)
+        evaled_loc = loc.eval(env)
+        evaled_value = value.eval(env)
+        if env.data[evaled_loc].nil?
+            env.data[evaled_loc] = Array[evaled_value]
+        else
+            env.data[evaled_loc] << evaled_value
+        end
       end
     }
   end
@@ -43,7 +49,15 @@ grammar SimpleSem
     'set' space loc:additive comma 'read' {
       def execute(env)
         print "input: "
-        env.data[loc.eval(env)] = $stdin.gets.strip.to_i
+        
+        evaled_loc = loc.eval(env)
+        input_value = $stdin.gets.strip.to_i
+        
+        if env.data[evaled_loc].nil?
+            env.data[evaled_loc] = Array[input_value]
+        else
+            env.data[evaled_loc] << input_value
+        end
       end  
     }
   end
@@ -83,7 +97,7 @@ grammar SimpleSem
   rule data_lookup
     'D[' expr:additive ']' {
       def eval(env)
-        env.data[expr.eval(env)]
+        env.data[expr.eval(env)].last
       end
     }
   end

data/lib/simplesem/simplesem_program.rb

@@ -42,4 +42,16 @@ class SimpleSemProgram
       end
     end
   end
+  
+  def inspect_data
+    res = String.new
+    @data.each_with_index {|loc, i| res += "#{i}: #{loc.last}\n" }
+    res
+  end
+  
+  def inspect_data_with_history
+    res = String.new
+    @data.each_with_index {|loc, i| res += "#{i}: #{loc.inspect}\n" }
+    res
+  end
 end

data/simplesem.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simplesem}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Olson"]
-  s.date = %q{2009-03-06}
+  s.date = %q{2009-04-01}
   s.default_executable = %q{simplesem}
   s.description = %q{SIMPLESEM Interpreter}
   s.email = %q{rko618@gmail.com}
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.files = ["LICENSE", "Manifest", "README.textile", "Rakefile", "bin/simplesem", "lib/simplesem/arithmetic.treetop", "lib/simplesem/arithmetic_node_classes.rb", "lib/simplesem/simple_sem.treetop", "lib/simplesem/simplesem_program.rb", "lib/simplesem.rb", "sample_programs/case-statement.txt", "sample_programs/gcd.txt", "sample_programs/hello-world.txt", "sample_programs/while-loop.txt", "simplesem.gemspec", "simplesem.tmproj", "test/simplesem_test.rb", "test/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/robolson/simplesem}
-  s.rdoc_options = ["--line-numbers", "--title", "Simplesem", "--main", "README.textile"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Simplesem", "--main", "README.textile"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{simplesem}
   s.rubygems_version = %q{1.3.1}

data/test/simplesem_test.rb

@@ -9,16 +9,37 @@ class SimpleSemParserTest < Test::Unit::TestCase
   def setup
     @parser = SimpleSemParser.new
     @ssp = SimpleSemProgram.new
-    @ssp.data[0] = 1
+    @ssp.data[0] = [1]
   end
   
   def test_set_stmt_assign
     parse('set 1, D[0]').execute(@ssp)
-    assert_equal [1, 1], @ssp.data
+    assert_equal [[1], [1]], @ssp.data
   end
   
-  def test_set_stmt_write
-    assert_nil parse('set write, "hello world!"').execute(@ssp)
+  def test_set_stmt_write_string
+    out = capture_stdout do
+      parse('set write, "Hello World!"').execute(@ssp)
+    end
+    assert_equal "Hello World!\n", out.string
+  end
+  
+  def test_set_stmt_write_expr
+    out = capture_stdout do
+      parse('set write, 2 > 1').execute(@ssp)
+    end
+    assert_equal "true\n", out.string
+  end
+  
+  def test_set_stmt_read
+    fake_in = StringIO.new("2\n3\n")
+    $stdin = fake_in
+    
+    capture_stdout do     # capture_stdout because we do not want "input:"'s in the test output
+      parse('set 1, read').execute(@ssp)
+      parse('set 1, read').execute(@ssp)
+    end
+    assert_equal [2, 3], @ssp.data[1]
   end
   
   def test_jump_stmt
@@ -28,56 +49,54 @@ class SimpleSemParserTest < Test::Unit::TestCase
   
   def test_set_to_data_loc
     parse('set D[0], 2').execute(@ssp)
-    assert_equal 2, @ssp.data[1]
+    assert_equal 2, @ssp.data[1].last
   end
   
   def test_complex_expr
-    @ssp.data[1] = 2
+    @ssp.data[1] = [2]
     parse('set 2, D[0]+D[1]*2').execute(@ssp)
-    assert_equal 5, @ssp.data[2]
+    assert_equal 5, @ssp.data[2].last
   end
   
   def test_parenthesis
-    @ssp.data[1] = 2
+    @ssp.data[1] = [2]
     parse('set 2, (D[0]+D[1])*2').execute(@ssp)
-    assert_equal 6, @ssp.data[2]
+    assert_equal 6, @ssp.data[2].last
   end
   
   def test_set_increment_instr
     parse('set 0, D[0]+1').execute(@ssp)
-    assert_equal 2, @ssp.data[0]
+    assert_equal 2, @ssp.data[0].last
   end
   
   def test_nested_data_lookup
-    @ssp.data[0] = 0
-    @ssp.data[1] = 1
+    @ssp.data[0] = [0]
+    @ssp.data[1] = [1]
     parse('set 2, D[D[0]+1]').execute(@ssp)
-    assert_equal 1, @ssp.data[2]
+    assert_equal 1, @ssp.data[2].last
   end
   
   def test_instruction_pointer
-    # run two dummy instructions, manually incrementing the program counter
+    # manually incrementing the program counter is required here
     @ssp.pc = 1
-    parse('set 0, 0').execute(@ssp)
-    @ssp.pc = 2
     parse('set 0, ip').execute(@ssp)
-    assert_equal 2, @ssp.data[0]  # check that the parser was able to read the ip correctly
+    assert_equal 1, @ssp.data[0].last  # checking that the parser was able to evaluate ip correctly
   end
   
   def test_jump_to_data_loc
-    @ssp.data[0] = 2
+    @ssp.data[0] = [2]
     parse('jump D[0]').execute(@ssp)
     assert_equal 2, @ssp.pc
   end
   
   def test_jumpt_stmt_true
-    @ssp.data[0] = 1
+    @ssp.data[0] = [1]
     parse('jumpt 5, D[0]=D[0]').execute(@ssp)
     assert_equal 5, @ssp.pc
   end
     
   def test_jumpt_stmt_false
-    @ssp.data[0] = 1
+    @ssp.data[0] = [1]
     parse('jumpt 5, D[0]=2').execute(@ssp)
     assert_equal 0, @ssp.pc   # pc should not have changed
   end
@@ -108,7 +127,7 @@ class SimpleSemParserTest < Test::Unit::TestCase
   
   def test_negative_number
     parse('set 0, -1').execute(@ssp)
-    assert_equal -1, @ssp.data[0]
+    assert_equal -1, @ssp.data[0].last
   end
   
   def test_halt

data/test/test_helper.rb

@@ -15,4 +15,14 @@ module ParserTestHelper
     assert !result.nil?
     result
   end
+end
+
+module Kernel
+  def capture_stdout
+    out = StringIO.new
+    $stdout = out
+    yield
+    $stdout = STDOUT
+    return out
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: robolson-simplesem
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Rob Olson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-06 00:00:00 -08:00
+date: 2009-04-01 00:00:00 -07:00
 default_executable: simplesem
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ homepage: http://github.com/robolson/simplesem
 post_install_message: 
 rdoc_options: 
 - --line-numbers
+- --inline-source
 - --title
 - Simplesem
 - --main