Ruby commands can now use blocks (fixed a bug in the grammar)

adamjmurray · Dec 5, 2008 · bac2659 · bac2659
1 parent ecdc0ea
commit bac2659
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/cosy/model/syntax_tree.rb b/lib/cosy/model/syntax_tree.rb
@@ -532,12 +532,12 @@ def value(context=nil)
   # to override them and raise in error for the online version
 
 
-  class CommandNode < TerminalNode
+  class CommandNode < RubyNode
     def atom?
       false
     end    
-    def evaluate(context=nil)
-      ruby.value(context)
+    def value(context=nil)
+      super
       return nil
     end
   end

diff --git a/lib/cosy/parser/grammar.treetop b/lib/cosy/parser/grammar.treetop
@@ -175,7 +175,7 @@ module Cosy
 
 
     rule command
-      '{' ruby:ruby '}' <CommandNode>
+      '{{' script:( string / !('}}'/'"'/"'") . )* '}}' <CommandNode>
     end
 
 

diff --git a/web/ruby_cgi.rb b/web/ruby_cgi.rb
@@ -7,12 +7,18 @@
 require 'cosy/renderer/midi_file_renderer.rb'
 module Cosy
   class RubyNode
-    def value(context)
+    def value(context=nil)
+      raise 'embedded Ruby not allowed online'
+    end
+    def evaluate(context=nil)
       raise 'embedded Ruby not allowed online'
     end
   end
   class CommandNode
-    def value(context)
+    def value(context=nil)
+      raise 'embedded Ruby not allowed online'
+    end
+    def evaluate(context=nil)
       raise 'embedded Ruby not allowed online'
     end
   end