ceml 0.3.0 → 0.3.1

data/lib/ceml/tt/lexer.treetop

@@ -22,13 +22,52 @@ grammar Lexer
     end
 
     rule number
-      [1-9]+ [0-9]* / '0'
+      ([1-9]+ [0-9]* / '0' / 'an' / 'a' / 'the') {
+          def value
+            case text_value
+            when 'a', 'an', 'the' then 1
+            else text_value.to_i
+            end
+          end
+      }
+    end
+
+    rule and
+        (ws? ',')? ws 'and' ws / ws? ',' ws?
+    end
+
+    rule reserved_word
+        'and' / 'within'
     end
 
     rule id
-      [a-zA-Z_-]+
+      !(reserved_word ws) [a-zA-Z_]+
+    end
+
+    rule distance
+      number ws? distance_unit:('miles' / 'mile' / 'mi' / 'km' / 'kilometers' / 'k' / 'meters' / 'm' / 'ft' / 'feet' / 'f' / 'blocks' / 'block')
+      {
+        def meters
+          number.text_value.to_f * case distance_unit.text_value
+          when /^mi/; 1600; when /^k/;  1000; when /^m/;  1;
+          when /^f/;  0.35; when /^b/;  200; else 1; end
+        end
+      }
+    end
+
+    rule range
+      min:number max:('+' / '-' number)?
+      {
+        def min
+            super.value
+        end
+        def max
+            return min if super.empty?
+            return 10000 if super.text_value == '+'
+            return super.number.text_value.to_i
+        end
+      }
     end
 
 end
 end
-

data/lib/ceml/tt/scripts.treetop

@@ -5,28 +5,43 @@ grammar Scripts
   include Instructions
 
   rule scripts
-    script+
+    script more:(nl script)* {
+        def list
+            [script] + more.elements.map(&:script)
+        end
+    }
   end
 
-  rule script
-    (script_with_title / script_with_instructions) <Script>
+  rule free_scripts
+    nl? scripts nl?
   end
 
-  rule script_with_title
-    nl? title casting_statement:casting_statement? instructions:instructions?
+  rule free_script
+    nl? script nl?
   end
 
-  rule script_with_instructions
-    nl? title:title? casting_statement:casting_statement? instructions
+  rule script
+    (
+        title nl casting_statement nl instructions /
+        title nl instructions /
+        casting_statement nl instructions /
+        title nl casting_statement /
+        instructions /
+        title
+    ) <Script>
   end
 
   rule title
-    '"' value:('\\"' / !'"' .)+ '"' nl {
-        def value
-            super.text_value.gsub(/\\"/, '"')
+    '"' value:('\\"' / !'"' .)+ '"' {
+        def title_value
+            value.text_value.gsub(/\\"/, '"')
         end
     }
   end
 
+  rule instructions
+      instruction_stmt more:(nl instruction_stmt)* <Instructions>
+  end
+
 end
 end

data/lib/ceml.rb

@@ -9,6 +9,7 @@ require 'ceml/tt/casting'
 require 'ceml/tt/instructions'
 require 'ceml/tt/scripts'
 
+require 'ceml/casting_criterion'
 require 'ceml/incident'
 
 module CEML
@@ -18,27 +19,25 @@ module CEML
   # puts "#{meth}: #{args.to_s.inspect}"
 end
 
-class CEML::ScriptsParser
-  def parse_with_root(string, root)
-    self.root = root
-    parse(string)
-  end
-end
-
 module CEML
   def parse(what, string)
-    result = nil
     string.gsub!(/\n +/, ' ')
-    string << "\n"
+    what = case what
+    when :script then :free_script
+    when :scripts then :free_scripts
+    else what
+    end
+    result = nil
     ScriptsParser.new.tap do |parser|
-      result = parser.parse_with_root(string, what)
+      result = parser.parse(string, :root => what)
       raise "parse failed: \n#{parser.failure_reason}" unless result
       case what
-      when :scripts
-        raise "no scripts found" unless result.elements and !result.elements.empty?
-        result = result.elements
+      when :free_scripts
+        raise "no scripts found" unless result.scripts.list
+        result = result.scripts.list
         result.each{ |s| s.validate! }
-      when :script
+      when :free_script
+        result = result.script
         result.validate!
       end
     end

data/test/helper.rb

@@ -5,25 +5,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'ceml'
 
-COMPLIMENT_SCRIPT = <<END_OF_SCRIPT
-"Overwhelm a specific person with compliments"
-gather 5-20 players within 4 blocks
-ask organizer re target: Describe their appearance and location
-tell agents: Look for |otherguy.target| and compliment them briefly, then move on.
-END_OF_SCRIPT
-
-ASKCHAIN_SCRIPT = <<ENDOFSCRIPT
-"Meet your neighbor"
-gather 2 players within 1 block
-ask players re color: what's your favorite color?
-ask players re observation: find someone near you with the color |otherguy.color|. what are they wearing?
-ask players re rightmatch: are you wearing |otherguy.observation|?
-ask players re task: take your new partner and see if you can find something beautiful in the park.
-
-ENDOFSCRIPT
-
-
-
 class Test::Unit::TestCase
   def play script
     @e = CEML::Incident.new(script)

data/test/test_casting.rb

@@ -24,14 +24,14 @@ class TestCasting < Test::Unit::TestCase
   def test_range
     cs = pcs "gather 3-4 runners"
     assert cs.type == :gather
-    assert cs.roles.include? :runners
+    assert cs.roles.names.include? :runners
     assert cs[:runners].min == 3
     assert cs[:runners].max == 4
     assert cs.max == 4
 
     cs = pcs "gather 3+ runners"
     assert cs.type == :gather
-    assert cs.roles.include? :runners
+    assert cs.roles.names.include? :runners
     assert cs[:runners].min == 3
     assert cs[:runners].max > 4
     assert cs.min == 3
@@ -39,7 +39,7 @@ class TestCasting < Test::Unit::TestCase
 
     cs = pcs "gather 3 runners"
     assert cs.type == :gather
-    assert cs.roles.include? :runners
+    assert cs.roles.names.include? :runners
     assert cs[:runners].min == 3
     assert cs[:runners].max == 3
     assert cs.min == 3
@@ -47,25 +47,24 @@ class TestCasting < Test::Unit::TestCase
 
     cs = pcs "gather runners"
     assert cs.type == :gather
-    assert cs.roles.include? :runners
+    assert cs.roles.names.include? :runners
     assert cs[:runners].min == 2
     assert cs[:runners].max > 10
     assert cs.min == 2
     assert cs.max > 10
 
-    cs = pcs "teams of 1-2 runners and 1 announcer"
-    assert cs.type == :teams
-    assert cs.roles.include? :runners
-    assert cs.roles.include? :announcer
+    cs = pcs "gather 1-2 runners and 1 announcer"
+    assert cs.type == :gather
+    assert cs.roles.names.include? :runners
+    assert cs.roles.names.include? :announcer
     assert cs[:runners].min == 1
     assert cs[:runners].max == 2
     assert cs.min == 2
-    assert cs.max > 20
+    assert cs.max == 3
 
     cs = pcs "nab 1-2 runners within 4 mi"
     assert cs.type == :nab
     assert cs.nab?
-    assert !cs.in_teams?
     assert cs[:runners].min == 1
     assert cs[:runners].max == 2
   end

data/test/test_incident.rb

@@ -1,8 +1,33 @@
 require 'ceml'
 require 'test/helper'
 
+COMPLIMENT_SCRIPT = <<XXX
+"Overwhelm a specific person with compliments"
+gather 5-20 players within 4 blocks
+ask organizer re target: Describe their appearance and location
+tell agents: Look for |otherguy.target| and compliment them briefly, then move on.
+XXX
+
+ASKCHAIN_SCRIPT = <<XXX
+"Meet your neighbor"
+gather 2 players within 1 block
+ask players re color: what's your favorite color?
+ask players re observation: find someone near you with the color |otherguy.color|. what are they wearing?
+ask players re rightmatch: are you wearing |otherguy.observation|?
+ask players re task: take your new partner and see if you can find something beautiful in the park.
+XXX
+
+
 class TestIncident < Test::Unit::TestCase
 
+  SIGNUP_SCRIPT = "await 1 new signup\ntell signup: thanks"
+  def test_signup_script
+    s = CEML.parse(:script, SIGNUP_SCRIPT)
+    c = CEML::Candidate.new('fred', ['new'], {}, nil, nil)
+    s.post c
+    assert s.launchable_location
+  end
+
   def test_incident
     play COMPLIMENT_SCRIPT
     player :joe, :organizer, :agent

data/test/test_instructions.rb

@@ -18,10 +18,10 @@ class TestInstructions < Test::Unit::TestCase
   end
 
   def test_instructions
-    assert_equal "run to the kitchen", pi('tell joe: run to the kitchen').tell([:joe]).text
+    assert_equal "run to the kitchen", pi('tell joe: run to the kitchen').i_tell([:joe]).text
     assert_equal ["favorite color?", "favorite soup?"], pi(
       "ask joe re color: favorite color?\nask joe re soup: favorite soup?"
-    ).asks([:joe]).map(&:text)
+    ).i_asks([:joe]).map(&:text)
   end
 
 end

data/test/test_scripts.rb

@@ -1,6 +1,6 @@
 require 'ceml'
 
-class TestInstructions < Test::Unit::TestCase
+class TestScripts < Test::Unit::TestCase
 
   SCRIPTS = <<END_OF_SCRIPTS
 "Help moving |an object|" // okay?

data/try

@@ -0,0 +1,14 @@
+#! /usr/bin/env ruby
+require 'rubygems'
+require 'ceml'
+require 'pp'
+
+begin
+  str = ARGV[1] ? ARGV[1].dup : STDIN.read
+  p = CEML::ScriptsParser.new
+  if result = p.parse(str, :root => ARGV[0].to_sym)
+    puts "worked!" # #{p.inspect}"
+  else
+    puts p.failure_reason
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 -08:00
+date: 2010-12-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - Rakefile
 - VERSION
 - beginners-guide.md
+- ceml.gemspec
 - editors/CEML.tmbundle/Syntaxes/ceml.tmLanguage
 - editors/CEML.tmbundle/info.plist
 - examples/breakfast-exchange.ceml
@@ -54,22 +55,20 @@ files:
 - examples/high-fives.ceml
 - lib/ceml.rb
 - lib/ceml/casting.rb
+- lib/ceml/casting_criterion.rb
 - lib/ceml/incident.rb
 - lib/ceml/instructions.rb
 - lib/ceml/script.rb
-- lib/ceml/tt/casting.rb
 - lib/ceml/tt/casting.treetop
-- lib/ceml/tt/instructions.rb
 - lib/ceml/tt/instructions.treetop
-- lib/ceml/tt/lexer.rb
 - lib/ceml/tt/lexer.treetop
-- lib/ceml/tt/scripts.rb
 - lib/ceml/tt/scripts.treetop
 - test/helper.rb
 - test/test_casting.rb
 - test/test_incident.rb
 - test/test_instructions.rb
 - test/test_scripts.rb
+- try
 has_rdoc: true
 homepage: http://github.com/citizenlogistics/ceml
 licenses: []
@@ -106,3 +105,4 @@ test_files:
 - test/test_incident.rb
 - test/test_instructions.rb
 - test/test_scripts.rb
+- examples/sample_delegate.rb