slightly improved parser

Author: marcel12bell

.ruby-version

@@ -1 +1 @@
-jruby-1.7.4
+1.9.3-p392

README.md

@@ -10,7 +10,7 @@ Get inspired by [Bret Victor](http://worrydream.com/#!/LearnableProgramming) or
 This drawing was made from a 6 year old girl at the CoderDojo cologne...
 
 There is a stand alone app to play with without need of installing all stuff.
-With "ellipse 50 50 80 80" or "rect/line/fill" you can draw and with mouse dragging change the values.
+With "ellipse 50, 50, 80, 80" or "rect/line/fill" you can draw and with mouse dragging change the values.
 
 
 Notice

main/canvas.rb

@@ -6,15 +6,31 @@ def initialize(lines)
   end
 
   def draw_canvas
-    elements = @lines.elements
-    elements.each do |str_obj|
-        send_if_runnable(str_obj.methode, str_obj.arguments) if str_obj.methode
-    end
+    evaluate(@lines.elements)
   end
 
 
   private
 
+  def evaluate(elements)
+    #eval all or only line by line
+    begin
+      code = ""
+      elements.each do |str_obj|
+        code += str_obj.content  + "\n" if str_obj.methode
+      end
+      return eval(code)
+    rescue Exception => e
+      begin
+        elements.each do |str_obj|
+          send_if_runnable(str_obj.methode, str_obj.arguments) if str_obj.methode
+        end
+      rescue Exception => e
+        puts "#{ e } (#{ e.class })!"
+      end
+    end
+  end
+
   def send_if_runnable(methode, args)
     begin
       send(methode, *args)

main/parse.rb

@@ -14,13 +14,17 @@ def update_line(key, key_code)
         @lines.make_new_line(@cursor)
       when 8
         @lines.delete_last_key(@cursor)
+      when 9
+        string_object = @lines.on_position_of(@cursor)
+        #update line key
+        string_object.append("  ") if string_object
       when 38 #up
         @lines.previous_line(@cursor)
       when 40 #down
         @lines.next_line(@cursor)
 
       when 37 #left
-      when 39 #right
+      when 39 # right
       when 157 #command
       when 17 #ctrl
       when 18 #alt

main/string_object.rb

@@ -27,7 +27,11 @@ def methode
   def arguments
     array = @content.split.to_a
     #splits the string after the methode into arguments array
-    (array.count > 2) ? array.map{ |e| e.to_i}[1..-1] : []
+    if (array.count > 2) 
+      update(array)
+    else
+      []
+    end
   end
 
   def update_argument(x_mouse, y_mouse)
@@ -36,7 +40,7 @@ def update_argument(x_mouse, y_mouse)
     if arg
       new_arg_value = -$app.width/2+x_mouse+$app.editor_left_margin-length((methode+ " ").to_s)-length(@object_list[1][0..arg].join(" ").to_s)+$app.initial_arg_value
       @object_list[1][arg] = new_arg_value
-      @content = @object_list.first + " " + @object_list[1].join(" ") + "\n" if @object_list.first
+      @content = @object_list.first + " " + @object_list[1].join(", ") + "\n" if @object_list.first
     end
   end
 
@@ -62,6 +66,17 @@ def get_position
 
   private
 
+    def update(array)
+      a = array.map do |e|
+        if /[[:alpha:]]/.match(e)
+          e
+        else
+          e.to_i
+        end
+      end
+      a[1..-1]
+    end
+
     def length(s)
       text_width(s.to_s).to_i unless s.nil?
     end

simple_live_coding.rb

@@ -46,9 +46,8 @@ def draw
     fill color 104, 153, 0
     @editor.draw_content
 
-
     text "this is a DEMO app", $app.width/2, $app.height-40
-    text "write 'rect 20 20 200 200' and drag the values...", $app.width/2, $app.height-20
+    text "write 'rect 20, 20, 200, 200' and drag the values...", $app.width/2, $app.height-20
 
     fill color 14, 13, 0
     @cursor.draw_line #we need a line marking the text position
@@ -75,7 +74,6 @@ def mouse_moved
     redraw
   end
 
-
   def mouse_pressed
     @pressed = [mouse_x, mouse_y]
     @initial_arg_value = @watcher.get_param(mouse_x, mouse_y) #get the initial value from watcher