ceml 0.5.6 → 0.5.7

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/ceml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]
-  s.date = %q{2011-01-18}
+  s.date = %q{2011-01-21}
   s.description = %q{a language for coordinating real world events}
   s.email = %q{joe@citizenlogistics.com}
   s.extra_rdoc_files = [

data/lib/ceml/driver.rb

@@ -16,7 +16,7 @@ module CEML
       PLAYERS[id] ||= []
       INCIDENTS[id] ||= CEML::Incident.new script, id if script
       raise "no incident #{id}" unless INCIDENTS[id]
-      yield INCIDENTS[id], PLAYERS[id] if block_given?
+      yield INCIDENTS[id], PLAYERS[id], {} if block_given?
       id
     end
 
@@ -26,8 +26,8 @@ module CEML
       script.post candidate, LOCATIONS[script]
       LOCATIONS[script].delete_if do |loc|
         next unless loc.cast
-        with_incident nil, script do |incident, players|
-          loc.cast.each{ |guy| subpost incident, players, guy.initial_state }
+        with_incident nil, script do |incident, players, metadata|
+          loc.cast.each{ |guy| subpost incident, players, metadata, guy.initial_state }
         end
       end
     end
@@ -37,12 +37,13 @@ module CEML
     end
 
     def post incident_id, player = nil
-      with_incident incident_id do |incident, players|
-        subpost incident, players, player
+      with_incident incident_id do |incident, players, metadata|
+        subpost incident, players, metadata, player
       end
     end
+    alias_method :run, :post
 
-    def subpost incident, players, player = nil
+    def subpost incident, players, metadata, player = nil
       if player
         player_id = player[:id]
         player[:roles] = Set.new([*player[:roles] || []])
@@ -56,18 +57,14 @@ module CEML
       end
       incident.run(players) do |player, meth, what|
         meth = "player_#{meth}"
-        send(meth, incident.id, player, what) if respond_to? meth
+        send(meth, incident.id, metadata, player, what) if respond_to? meth
       end
     end
 
     JUST_SAID = {}
-    def player_said(incident_id, player, what)
+    def player_said(incident_id, metadata, player, what)
       JUST_SAID[player[:id]] = what
       puts "Said #{what.inspect}"
     end
-
-    # def player_delay(incident_id, player, seconds)
-    #   sleep seconds if seconds < 20
-    # end
   end
 end

data/lib/ceml/incident.rb

@@ -69,8 +69,11 @@ module CEML
     end
 
     def expand(role, var)
-      return (this[:qs_answers]||{})[var] if role =~ /^his|her$/
-      role = nil if role == 'otherguy'
+      case role
+      when 'his', 'her', 'their';                 return qs_answers[var]
+      when 'world', 'game', 'exercise', 'group';  return (cb :world, var)
+      when 'somebody', 'someone';                 role = nil
+      end
       role = role.to_sym if role
       @players.each do |p|
         next if p == this

data/lib/ceml/tt/casting.treetop

@@ -35,11 +35,11 @@ grammar Casting
       (rolename &and / range ws qualifier ws rolename / range ws rolename / qualifier ws rolename / rolename) {
         def name; if respond_to? :rolename then rolename.text_value else text_value end; end
         def min
-            return range.min if respond_to? :range
+            return range.value.min if respond_to? :range
             name =~ /s$/ ? 2 : 1
         end
         def max
-            return range.max if respond_to? :range
+            return range.value.max if respond_to? :range
             name =~ /s$/ ? 10000 : 1
         end
         def qualifiers

data/lib/ceml/tt/lexer.treetop

@@ -22,12 +22,9 @@ grammar Lexer
     end
 
     rule number
-      ([1-9]+ [0-9]* / '0' / 'an' / 'a' / 'one' / 'the') {
+      ([1-9]+ [0-9]* / '0') {
           def value
-            case text_value
-            when 'a', 'an', 'the', 'one' then 1
-            else text_value.to_i
-            end
+            text_value.to_i
           end
       }
     end
@@ -66,16 +63,22 @@ grammar Lexer
     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
+      (
+          min:number '-' max:number / floor:number '+'? /
+          'an' / 'a' / 'one' / 'the' / 'some' / 'several' / 'many'
+      ) {
+          def value
+            case text_value
+            when 'an', 'a', 'one', 'the' then (1..1)
+            when 'some'                  then (1..10000)
+            when 'several'               then (3..10000)
+            when 'many'                  then (5..10000)
+            when /^\d+\+$/               then (floor.value..10000)
+            when /^\d+\-\d+$/            then (min.value..max.value)
+            when /^\d+$/                 then (floor.value..floor.value)
+            else raise 'hell'
+            end
+          end
       }
     end
 

data/test/test_incident.rb

@@ -5,7 +5,7 @@ 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.
+tell agents: Look for |somebody.target| and compliment them briefly, then move on.
 XXX
 
 JANE_SCRIPT = <<XXX
@@ -144,8 +144,8 @@ 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 observation: find someone near you with the color |somebody.color|. what are they wearing?
+ask players re rightmatch: are you wearing |somebody.observation|?
 ask players re task: take your new partner and see if you can find something beautiful in the park.
 XXX
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -08:00
+date: 2011-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency