nudge 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/instructions/infrastructure.rb

@@ -28,6 +28,10 @@ class Instruction
   class MissingInstructionError < RuntimeError
   end
   
+  class CodeOversizeError < ArgumentError
+  end
+  
+  
   def initialize(context)
     @context = context
   end
@@ -51,6 +55,9 @@ class Instruction
   
   
   def pushes(stackName, literal)
+    if (stackName.to_s == "code") && (literal.value.length > self.context.code_char_limit)
+      raise(CodeOversizeError, ":code cannot have more than #{self.context.code_char_limit} chars")
+    end
     @context.stacks[stackName].push literal
   end
   
@@ -62,7 +69,7 @@ class Instruction
       self.cleanup
     end
   rescue NotEnoughStackItems, MissingInstructionError,
-    InstructionMethodError, NaNResultError, FloatDomainError => exc
+    InstructionMethodError, NaNResultError, FloatDomainError, CodeOversizeError => exc
     msg = ValuePoint.new("error", exc.message)
     pushes :error, msg
   end

data/lib/interpreter/interpreter.rb

@@ -17,6 +17,8 @@ module Nudge
     attr_accessor :stacks, :instructions_library, :variables, :names, :types
     attr_accessor :last_name, :evaluate_references
     attr_accessor :sensors
+    attr_accessor :code_char_limit
+    attr_accessor :start_time, :time_limit
     
     
     # A program to be interpreted can be passed in as an optional parameter
@@ -25,6 +27,8 @@ module Nudge
       @program = initialProgram
       @types = params[:types] || NudgeType.all_types
       @step_limit = params[:step_limit] || 3000
+      @time_limit = params[:time_limit] || 60.0 # seconds
+      @code_char_limit = params[:code_char_limit] || 2000
       @sensors = Hash.new
       
       instructions = params[:instructions] || Instruction.all_instructions
@@ -61,6 +65,7 @@ module Nudge
         @stacks[:exec].push(NudgeProgram.new(program).linked_code)
       end
       @steps = 0
+      @start_time = Time.now
       @evaluate_references = true
     end
     
@@ -107,7 +112,9 @@ module Nudge
     # 1. Is the <b>:exec</b> stack empty?
     # 2. Are the number of steps greater than self.step_limit?
     def notDone?
-      @stacks[:exec].depth > 0 && @steps < @step_limit
+      @stacks[:exec].depth > 0 &&
+      @steps < @step_limit && 
+      (Time.now-@start_time)<@time_limit
     end
     
     
@@ -132,6 +139,7 @@ module Nudge
     
     # invoke self.step() until a termination condition is true
     def run
+      @start_time = Time.now
       while notDone?
         self.step
       end

data/lib/interpreter/nudge_program.rb

@@ -1,7 +1,4 @@
 #encoding: utf-8
-require 'treetop'
-Treetop.load(File.join(File.dirname(__FILE__),'grammars', "nudge_codeblock.treetop"))
-
 
 module Nudge
   class NudgeProgram
@@ -22,14 +19,10 @@ module Nudge
       raise(ArgumentError, "NudgeProgram.new should be passed a string") unless sourcecode.kind_of?(String)
       @raw_code = sourcecode
       
-      # snipped out:
-      # program_split!
       split_at_first_guillemet=@raw_code.partition( /^(?=«)/ )
       @code_section = split_at_first_guillemet[0].strip
       @footnote_section = split_at_first_guillemet[2].strip
       
-      #snipped out:
-      #relink_code!
       parsed_code = NudgeTree.from(@raw_code)
       @linked_code = parsed_code[:tree] 
       @footnotes = parsed_code[:unused]
@@ -152,14 +145,13 @@ module Nudge
     
     
     def parses?(program_blueprint = @code_section)
-      (NudgeCodeblockParser.new.parse(program_blueprint) != nil)
+      !NudgeTree.from(program_blueprint)[:tree].kind_of?(NilPoint)
     end
     
     
     
     def tidy
-      framework = NudgeCodeblockParser.new.parse(@code_section)
-      framework ? framework.tidy : ""
+      NudgeTree.from(@raw_code)[:tree].tidy
     end
     
     

data/lib/nudge.rb

@@ -1,22 +1,10 @@
 $: << File.join(File.dirname(__FILE__), "/../lib") 
 
 require 'rubygems'
-require 'treetop'
 require 'active_support'
 
 require 'interpreter/parse.tab'
 
-require 'interpreter/grammars/nudge_common'
-
-require 'interpreter/grammars/nudge_value_helpers'
-require 'interpreter/grammars/nudge_reference_helpers'
-require 'interpreter/grammars/nudge_instruction_helpers'
-require 'interpreter/grammars/nudge_codeblock_helpers'
-require 'interpreter/grammars/nudge_reference'
-require 'interpreter/grammars/nudge_instruction'
-require 'interpreter/grammars/nudge_value'
-require 'interpreter/grammars/nudge_codeblock'
-
 require 'interpreter/nudge_program'
 
 require 'cli/runner'

data/readme.md

@@ -58,7 +58,9 @@ The interpreter code relies heavily on functional programming features of Ruby 1
 
 The following gems need to be present to run the code:
 
-* [treetop](http://treetop.rubyforge.org/)
-* [activesupport](http://as.rubyonrails.org/)
+* [activesupport](http://as.rubyonrails.org/) (`gem install activesupport`)
+
+To use the fancypants command line generators we're building, you'll need thor:
+* [thor](http://github.com/wycats/thor/) (`gem install thor`)
   
-and you will want [rspec](http://rspec.info/) to be able to run the specs and confirm the codebase works on your system.
+and you will definitely want [rspec](http://rspec.info/) to be able to run the specs and confirm the codebase works on your system: `gem install rspec`.

data/spec/instructions/instruction_class_spec.rb

@@ -15,6 +15,7 @@ describe "Instruction has a master list" do
   end
 end
 
+
 describe "capturing errors" do
   describe "NotEnoughStackItems" do
     describe "#preconditions?" do
@@ -36,5 +37,16 @@ describe "capturing errors" do
       context.stacks[:error].peek.blueprint.should include "needs IntAddInstruction"
     end
   end
-  
+end
+
+
+describe ":code stack has a special rule" do
+  it "should be impossible to use #pushes to push a :code item that is too large for the context" do
+    small_box = Interpreter.new("block {}", code_char_limit:20)
+    small_code = ValuePoint.new("code","block { do a }")
+    long_code = ValuePoint.new("code","block { do a do b do c do d do e do f do g }")
+    throwaway = IntAddInstruction.new(small_box)
+    lambda{throwaway.pushes(:code, long_code)}.should raise_error(Instruction::CodeOversizeError)
+    lambda{throwaway.pushes(:code, small_code)}.should_not raise_error(Instruction::CodeOversizeError)
+  end
 end

data/spec/instructions/int/int_power_spec.rb

@@ -68,6 +68,7 @@ describe IntPowerInstruction do
         context.peek(:error).blueprint.should include("Infinity")
         context.stacks[:int].depth.should == 0
       end
+      
     end
   end
 end

data/spec/interpreter/interpreter_spec.rb

@@ -45,12 +45,30 @@ describe "initialization" do
     @ii.steps.should == 0
   end
   
+  it "#reset should reset the start_time counter to 0" do
+    @ii.start_time = 999999999999
+    @ii.reset
+    @ii.start_time.should be_a_kind_of(Time)
+  end
+  
   it "#reset should reset the #sensors Hash" do
     @ii.register_sensor("z") {1201}
     @ii.reset
     @ii.sensors["z"].should == nil
   end
   
+  it "should have a code_char_limit" do
+    lambda{@ii.code_char_limit}.should_not raise_error
+  end
+  
+  it "should have a default code_char_limit of 2000 characters" do
+    @ii.code_char_limit.should == 2000
+  end
+  
+  it "should be possible to set code_char_limit with an option" do
+    Interpreter.new("block {}",code_char_limit:171).code_char_limit.should == 171
+  end
+  
   
   it "should load a complex CodeBlock as a single item on the exec stack" do
     myCode = "block {\ndo foo\n do bar\n block {\ndo baz}}"
@@ -421,6 +439,13 @@ describe "stepping" do
     @ii.steps.should == 20
   end
   
+  it "should step only until its time_limit is reached or exceeded" do
+    @ii.reset("block {}")
+    @ii.start_time = (Time.now - 10000)
+    @ii.run
+    @ii.steps.should == 1
+  end
+  
 end
 
 describe "running" do
@@ -489,7 +514,7 @@ describe "resetting" do
   end
   
   it "should not affect variable bindings" do
-    ii = Interpreter.new
+    ii = Interpreter.new("block {}")
     ii.bind_variable("a", ValuePoint.new("int",3))
     ii.variables.keys.should == ["a"]
     ii.reset

data/spec/interpreter/nudge_program_spec.rb

@@ -1,6 +1,5 @@
 #encoding: utf-8
 require File.join(File.dirname(__FILE__), "./../spec_helper")
-load_grammar('codeblock')
 include Nudge
 
 

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ $: << File.join(File.dirname(__FILE__), "/../lib")
 
 require 'spec'
 require 'pp'
-require 'nudge'
+require 'lib/nudge'
 require 'erb'
 
 Spec::Runner.configure do |config|

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bill Tozier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-04-08 00:00:00 -04:00
 default_executable: nudge
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -216,15 +216,6 @@ files:
 - lib/instructions/name/name_unbind.rb
 - lib/instructions/name/name_yank.rb
 - lib/instructions/name/name_yankdup.rb
-- lib/interpreter/grammars/nudge_codeblock.treetop
-- lib/interpreter/grammars/nudge_codeblock_helpers.rb
-- lib/interpreter/grammars/nudge_common.treetop
-- lib/interpreter/grammars/nudge_instruction.treetop
-- lib/interpreter/grammars/nudge_instruction_helpers.rb
-- lib/interpreter/grammars/nudge_reference.treetop
-- lib/interpreter/grammars/nudge_reference_helpers.rb
-- lib/interpreter/grammars/nudge_value.treetop
-- lib/interpreter/grammars/nudge_value_helpers.rb
 - lib/interpreter/interpreter.rb
 - lib/interpreter/nudge_program.rb
 - lib/interpreter/parse.tab.rb

data/lib/interpreter/grammars/nudge_codeblock.treetop

@@ -1,17 +0,0 @@
-require 'nudge'
-
-
-grammar NudgeCodeblock
-  include NudgeCommon
-  include NudgeReference
-  include NudgeInstruction
-  include NudgeValue
-  
-  rule codesection
-    value / instruction / reference / (block_statement <CodeblockParseNode>)
-  end
-  
-  rule block_statement
-    'block' spcs? '{' spcs? block_contents:(codesection spcs?)* '}' 
-  end
-end

data/lib/interpreter/grammars/nudge_codeblock_helpers.rb

@@ -1,19 +0,0 @@
-# coding: utf-8
-module CodeblockParseNode
-  def contents
-    block_contents.elements.collect {|e| e.elements[0]}
-  end
-  
-  def tidy(level=1)
-    tt = "block {"
-    indent = level*2
-    contents.each {|item| tt += ("\n" + (" "*indent) + item.tidy(level+1))}
-    tt += "}"
-    return tt
-  end
-  
-  def to_point
-    c = CodeblockPoint.new(contents.collect {|e| e.to_point})
-  end
-end
-

data/lib/interpreter/grammars/nudge_common.treetop

@@ -1,15 +0,0 @@
-# encoding: utf-8
-grammar NudgeCommon
-  rule common
-    spcs / alphas_and_underscores
-  end
-  
-  rule spcs
-    [\s\t\n]+
-  end
-  
-  rule alphas_and_underscores
-    [\p{Alpha}] [_\p{Alnum}/u]*
-  end
-  
-end

data/lib/interpreter/grammars/nudge_instruction.treetop

@@ -1,14 +0,0 @@
-#encoding: utf-8
-require 'interpreter/grammars/nudge_common'
-
-grammar NudgeInstruction
-  include NudgeCommon
-  
-  rule instruction
-    'do' spcs opcode <InstructionParseNode>
-  end
-  
-  rule opcode
-    alphas_and_underscores
-  end
-end

data/lib/interpreter/grammars/nudge_instruction_helpers.rb

@@ -1,14 +0,0 @@
-# coding: utf-8
-class InstructionParseNode < Treetop::Runtime::SyntaxNode
-  def instruction_name
-    opcode.text_value
-  end
-  
-  def tidy(level=1)
-    "do #{instruction_name}"
-  end
-  
-  def to_point
-    InstructionPoint.new(instruction_name)
-  end
-end

data/lib/interpreter/grammars/nudge_reference.treetop

@@ -1,9 +0,0 @@
-require 'interpreter/grammars/nudge_common'
-
-grammar NudgeReference
-  include NudgeCommon
-
-  rule reference
-    'ref' spcs vname:alphas_and_underscores <ReferenceParseNode>
-  end
-end

data/lib/interpreter/grammars/nudge_reference_helpers.rb

@@ -1,14 +0,0 @@
-# coding: utf-8
-class ReferenceParseNode < Treetop::Runtime::SyntaxNode
-  def variable_name
-    vname.text_value
-  end
-  
-  def tidy(level=1)
-    "ref #{variable_name}"
-  end
-  
-  def to_point
-    ReferencePoint.new(variable_name)
-  end
-end

data/lib/interpreter/grammars/nudge_value.treetop

@@ -1,14 +0,0 @@
-# encoding: utf-8
-require 'interpreter/grammars/nudge_common'
-
-grammar NudgeValue
-  include NudgeCommon
-  
-  rule value
-    'value' spcs? '«' footnote_type '»' <ValueParseNode>
-  end
-  
-  rule footnote_type
-    alphas_and_underscores
-  end
-end

data/lib/interpreter/grammars/nudge_value_helpers.rb

@@ -1,19 +0,0 @@
-# coding: utf-8
-class ValueParseNode < Treetop::Runtime::SyntaxNode
-  def type=(new_type)
-    @type = new_type
-  end
-  
-  def type
-    @type ||= footnote_type.text_value
-  end
-  
-  def tidy(level=1)
-    "value «#{type}»"
-  end
-  
-  def to_point
-    return ValuePoint.new(type)
-  end
-  
-end