ceml 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/ceml.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ceml}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Edelman"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-01-30}
   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

@@ -86,7 +86,7 @@ module CEML
       updated_players.each do |player|
         player_id = player[:id]
         player[:roles] = Set.new([*player[:roles] || []])
-        player[:roles] << :agents
+        player[:roles] << :agents << :players
         if existing_player = players.find{ |p| p[:id] == player_id }
           existing_player[:roles] += player.delete :roles
           existing_player.update player
@@ -96,13 +96,20 @@ module CEML
       end
       incident.run(players) do |player, meth, what|
         meth = "player_#{meth}"
-        send(meth, incident.id, metadata, player, what) if respond_to? meth
+        log "[#{incident.id}] #{meth}: #{player[:id]} #{what.inspect}"
+        if respond_to? meth
+          metadata.update :player => player, :players => players, :id => incident.id
+          result = send(meth, metadata, what)
+          metadata.delete :player
+          metadata.delete :players
+          result
+        end
       end
     end
 
     JUST_SAID = {}
-    def player_said(incident_id, metadata, player, what)
-      JUST_SAID[player[:id]] = what
+    def player_said(data, what)
+      JUST_SAID[data[:player][:id]] = what
       puts "Said #{what.inspect}"
     end
   end

data/lib/ceml/incident.rb

@@ -35,35 +35,51 @@ module CEML
       @callback = @players = nil
     end
 
+    def role_info
+      { :is_transient => is_transient? }
+    end
+
+    def is_transient?
+      main_seq.none? do |opcode, arg|
+        case opcode
+        when :start_delay, :ask_q, :assign, :null_assign then true
+        end
+      end
+    end
+
+    def main_seq
+      bytecode = []
+      instrs = script.instructions_for(roles)
+      instrs.each do |inst|
+        if inst.delay
+          bytecode << [:start_delay, inst.delay]
+          bytecode << [:complete_delay]
+        end
+        case inst.cmd
+        when :register
+          bytecode << [:answered_q, {:key => inst.key}]
+        when :ask
+          bytecode << [:ask_q, {:text => inst.text}]
+          bytecode << [:answered_q, {:key => inst.key}]
+        when :tell
+          bytecode << [:send_msg, {:text=>inst.text}]
+        when :assign
+          bytecode << [:assign, {:text=>inst.text}]
+          bytecode << [:complete_assign, {:text=>inst.text}]
+        end
+      end
+      if instrs.empty? and script.title
+        bytecode << [:null_assign]
+        bytecode << [:complete_assign]
+      end
+      bytecode
+    end
+
     def seq
       @seq ||= {}
       @seq[roles] ||= begin
-        bytecode = [[:start]]
-        instrs = script.instructions_for(roles)
-        instrs.each do |inst|
-          if inst.delay
-            bytecode << [:start_delay, inst.delay]
-            bytecode << [:complete_delay]
-          end
-          case inst.cmd
-          when :register
-            bytecode << [:answered_q, inst]
-          when :ask
-            bytecode << [:ask_q, inst]
-            bytecode << [:answered_q, inst]
-          when :tell
-            if script.title
-              bytecode << [:assign, inst]
-              bytecode << [:complete_assign, inst]
-            else
-              bytecode << [:send_msg, inst]
-            end
-          end
-        end
-        if instrs.empty? and script.title
-          bytecode << [:null_assign]
-          bytecode << [:complete_assign]
-        end
+        bytecode = [[:start, role_info]]
+        bytecode.concat main_seq
         bytecode << [:finish]
       end
     end
@@ -83,6 +99,17 @@ module CEML
       nil
     end
 
+    INTERPOLATE_REGEX = /\|(\w+)\.?(\w+)?\|/
+
+    def interpolate(text)
+      text =~ INTERPOLATE_REGEX or return text
+      text.gsub(INTERPOLATE_REGEX) do |m|
+        var, role = *[$2, $1].compact
+        expand(role, var) or return false
+      end
+    end
+
+
     # ==============
     # = basic flow =
     # ==============
@@ -91,7 +118,7 @@ module CEML
       cb :said, params.merge(:said => x)
     end
 
-    def start;  true; end
+    def start(x); true; end
     def finish; true; end
 
     def start_delay seconds
@@ -106,26 +133,26 @@ module CEML
     end
 
     def ask_q q
-      text = q.interpolate(self) or return false
+      text = interpolate(q[:text]) or return false
       say :ask, :q => text
       true
     end
 
     def answered_q q
       got or return false
-      qs_answers[q.key] = got
+      qs_answers[q[:key]] = got
       handled!
       true
     end
 
     def send_msg a
-      text = a.interpolate(self) or return false
+      text = interpolate(a[:text]) or return false
       say :message, :msg => text
       true
     end
 
     def assign a
-      text = a.interpolate(self) or return false
+      text = interpolate(a[:text]) or return false
       say :assignment, :msg => text
       true
     end
@@ -133,6 +160,7 @@ module CEML
     def complete_assign a = nil
       got or return false
       if recognized == :done
+        cb :did_complete
         say :ok
         handled!
         true

data/lib/ceml/script.rb

@@ -16,7 +16,7 @@ module CEML
     end
 
     def nabs?
-      cast.type == :nab
+      cast.type == :nab or !title
     end
 
 
@@ -71,7 +71,7 @@ module CEML
 
     def cast
       return casting_statement if respond_to? :casting_statement
-      return DefaultDP.new nil, [:agents], 0, :nab
+      return DefaultDP.new nil, [:agents], 0, :gather
     end
 
     def_delegators :cast, :radius

data/lib/ceml/tt/instructions.treetop

@@ -5,16 +5,6 @@ grammar Instructions
     rule basic_statement
         (ask_stmt / tell_stmt / assign_stmt / register_stmt) {
 
-            INTERPOLATE_REGEX = /\|(\w+)\.?(\w+)?\|/
-
-            def interpolate(env)
-              text =~ INTERPOLATE_REGEX or return text
-              text.gsub(INTERPOLATE_REGEX) do |m|
-                var, role = *[$2, $1].compact
-                env.expand(role, var) or return false
-              end
-            end
-
             def delay
                 if parent.respond_to? :later and not parent.later.empty?
                     parent.later.duration.seconds
@@ -29,9 +19,10 @@ grammar Instructions
             end
             def key;   var || text; end
             def cmd;
-              text_value =~ /^ask/           and return :ask
-              text_value =~ /^(tell|assign)/ and return :tell
-              text_value =~ /^register/      and return :register
+              text_value =~ /^ask/      and return :ask
+              text_value =~ /^tell/     and return :tell
+              text_value =~ /^assign/   and return :assign
+              text_value =~ /^register/ and return :register
             end
         }
     end

data/test/test_incident.rb

@@ -135,6 +135,23 @@ class TestIncident < Test::Unit::TestCase
     end
   end
 
+  def test_interpolation
+    s = "\"Soccer in the park\"\ngather 2 players within 1mi\nask players re color: which color?\ntell players: its |someone.color|\n"
+    s = CEML.parse(:script, s)
+    instrs = s.instructions_for(s.roles)
+    assert !instrs.empty?
+    play s do
+      player :bill, :players
+      player :fred, :players
+      asked :bill, /color\?/i
+      asked :fred, /color\?/i
+      says :bill, 'red'
+      says :fred, 'blue'
+      told :fred,  /its red/i
+      told :bill,  /its blue/i
+    end
+  end
+
   def test_await
     s = CEML.parse(:script, "await a,b,c\ntell a: foo\ntell b: bar\ntell c: baz")
     play do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Joe Edelman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -07:00
+date: 2011-01-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency