madrona-rad 0.2.5 → 0.2.6

data/lib/rad/rad_type_checker.rb

@@ -0,0 +1,26 @@
+require 'ruby_to_ansi_c'
+
+class RADTypeChecker < TypeChecker
+  
+  def process_const(exp)
+    c = exp.shift
+    if c.to_s =~ /^[A-Z]/ then
+      # TODO: validate that it really is a const? 
+      # uber hackery
+      # since constants are defined in the arduino_sketch define method and 
+      # we can't inject them into the methods 
+      # transport them here with a $define_types hash
+
+      $define_types.each do |k,v|
+        if k == c.to_s
+          @const_type = eval "Type.#{v}"
+        end
+      end
+      return t(:const, c, @const_type)
+    else
+      raise "I don't know what to do with const #{c.inspect}. It doesn't look like a class."
+    end
+    raise "need to finish process_const in #{self.class}"
+  end
+  
+end

data/lib/rad/sim/arduino_sketch.rb

@@ -0,0 +1,57 @@
+ON = true
+OFF = !ON
+HIGH = ON
+LOW = !HIGH
+
+class ArduinoSketch
+  attr_accessor :pins  
+   
+  def initialize
+    @pins = self.class.instance_variable_get("@pins")
+  end
+  
+  def self.output_pin(num, opts)
+    module_eval "@pins ||= []"
+    module_eval do 
+      @pins <<  Pin.new( num, :type => :output )
+    end
+
+    if opts[:as]
+       module_eval <<-CODE
+         def #{opts[:as]}
+           pins.select{|p| p.num == #{num}}.first
+         end
+       CODE
+     end
+  end
+
+  def loop    
+  end
+  
+  def digitalWrite( pin, value )
+    to_change = pins.select{|p| p.num == pin.num}.first
+    to_change.value = value
+  end
+
+  def delay( millis )
+  end
+  
+  # def serial_read
+  # end
+
+  # def serial_available
+  # end
+
+  # def blink
+  # end
+end
+
+class Pin
+  attr_accessor :num, :type, :value
+
+  def initialize num, opts
+    @num = num
+    @type = opts[:type]
+    @value = opts[:value] || false
+  end
+end

data/lib/rad/tasks/build_and_make.rake

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + "/../init.rb")
 require 'ruby_to_ansi_c'
 
-C_VAR_TYPES = "unsigned|int|long|double|str|char|byte"
+C_VAR_TYPES = "unsigned|int|long|double|str|char|byte|bool"
 
 # incredibly primitive tests 
 # rake test:compile or rake test:upload
@@ -55,14 +55,14 @@ namespace :make do
   end
   
   desc "generate a makefile and use it to compile the .cpp using the current .cpp file"
-  task :compile_cpp => ["build:sketch_dir", :clean_sketch_dir] do # should also depend on "build:sketch"
+  task :compile_cpp => ["build:sketch_dir", "build:gather_required_plugins", "build:plugin_setup", "build:setup", :clean_sketch_dir] do # should also depend on "build:sketch"
     Makefile.compose_for_sketch( @test_dir + @sketch_name )
     # not allowed? sh %{export PATH=#{Makefile.software_params[:arduino_root]}/tools/avr/bin:$PATH}
     sh %{cd #{RAD_ROOT}/#{@test_dir + @sketch_name}; make depend; make}
   end
   
   desc "generate a makefile and use it to compile the .cpp and upload it using current .cpp file"
-  task :upload_cpp => ["build:sketch_dir", :clean_sketch_dir] do # should also depend on "build:sketch"
+  task :upload_cpp => ["build:sketch_dir", "build:gather_required_plugins", "build:plugin_setup", "build:setup", :clean_sketch_dir] do # should also depend on "build:sketch"
     Makefile.compose_for_sketch( @test_dir + @sketch_name )
     # not allowed? sh %{export PATH=#{Makefile.software_params[:arduino_root]}/tools/avr/bin:$PATH}
     sh %{cd #{RAD_ROOT}/#{@test_dir + @sketch_name}; make depend; make upload}
@@ -70,7 +70,7 @@ namespace :make do
   
   task :clean_sketch_dir => ["build:file_list", "build:sketch_dir"] do
     @sketch_name = @sketch_class.split(".").first
-    FileList.new(Dir.entries("#{RAD_ROOT}/#{@test_dir + @sketch_name}")).exclude("#{@test_dir + @sketch_name}.cpp").exclude(/^\./).each do |f|
+    FileList.new(Dir.entries("#{RAD_ROOT}/#{@test_dir + @sketch_name}")).exclude("#{@sketch_name}.cpp").exclude(/^\./).each do |f|
       sh %{rm #{RAD_ROOT}/#{@test_dir + @sketch_name}/#{f}}
     end
   end

data/lib/rad/variable_processing.rb

@@ -1,6 +1,6 @@
 module ExternalVariableProcessing
-  # issues
-  # testing
+  # issues 
+  # testing 
   # add checking for colon
 
     
@@ -42,11 +42,11 @@ module ExternalVariableProcessing
             type = var
             value = nil
             post_process_vars(name, type, value)
-            return
+          else
+            value = var.split(",").first.lstrip
+            type = var.split(",")[1].nil? ?  nil : var.split(",")[1].lstrip
+            translate_variables( name , type, value )
           end
-          value = var.split(",").first.lstrip
-          type = var.split(",")[1].nil? ?  nil : var.split(",")[1].lstrip
-          translate_variables( name , type, value )
         when TrueClass
           # puts "pre_process: #{name}, #{var}, #{var.inspect} got #{var.class} on 50"
           value = 1
@@ -57,13 +57,14 @@ module ExternalVariableProcessing
           value = 0
           type = "bool"
           post_process_vars(name, type, value)
+        when Array
+          post_process_arrays(name, var)
         else
-          raise ArgumentError, "error message here.. got #{name}" 
-        end
-		    
-      
+          raise ArgumentError, "not sure what to do here...  got #{name} with value #{var} which is a #{var.class}" 
+        end      
     end     
     
+    
     def translate_variables(name, type = nil, value = nil)
       
       unless type.nil?
@@ -75,6 +76,16 @@ module ExternalVariableProcessing
         # puts "translate_variables: #{name}, #{value}, #{type} is a fixnum, got #{value.class} on 74"
       elsif value.class == Float 
         # puts "translate_variables: #{name}, #{value}, #{type} is a float, got #{value.class} on 76"
+      elsif value =~ /^-(\d|x)*$/ 
+        value = value.to_i
+        type = "int" if type.nil?
+      elsif value =~ /^-(\d|\.|x)*$/ 
+        value = value.to_f
+        unless type.nil?
+          raise ArgumentError, "#{value} should be a float got  #{type}" unless type == "float"
+        end
+        type = "float" if type.nil?   
+
       elsif value[0,1] !~ /\d/
         # puts value[0,1]
         # puts "translate_variables: #{name}, #{value}, #{type} is a number of some type, got #{value.class} on 79"
@@ -101,16 +112,42 @@ module ExternalVariableProcessing
 
     
     def post_process_vars(name, type, value = nil)
-      value = " = #{value}" if value
-      
+      value = " = #{value}" if value 
       $external_var_identifiers << "__#{name}" unless $external_var_identifiers.include?("__#{name}")
       $external_vars << "#{type} __#{name}#{value};"
     end
     
+    def post_process_arrays(name, var)
+      type = c_type(var[0])
+      $array_types[name] = type
+      assignment = var.inspect.gsub("[","{").gsub("]","}")      
+      c_style_array = "#{type} __#{name}[] = #{assignment};"
+      $external_var_identifiers << "__#{name}" unless $external_var_identifiers.include?("__#{name}")
+      $external_array_vars << c_style_array unless $external_array_vars.include?(c_style_array)
+    end
+    
     def check_variable_type(type)
       unless type =~ /#{C_VAR_TYPES}/
         raise ArgumentError, "the following variable types are supported \n #{C_VAR_TYPES.gsub("|",", ")} got #{type}" 
       end
     end
+    
+    def c_type(typ)
+      type = 
+        case typ 
+        when Integer
+          "int"
+        when String
+          "char*"
+        when TrueClass
+          "bool"
+        when FalseClass
+          "bool"
+        else
+          raise "Bug! Unknown type #{typ.inspect} in c_type"
+        end
+
+        type
+    end
    
 end

data/lib/rad/version.rb

@@ -2,7 +2,7 @@ module Rad #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_array_processing.rb

@@ -0,0 +1,179 @@
+$TESTING = true
+
+# need to tell it where we are
+# lets review these
+# neee to remove this constant from tests and pull it from rad
+C_VAR_TYPES = "unsigned|int|long|double|str|char|byte|float|bool"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/variable_processing"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_sketch"
+require 'test/unit'
+
+
+class TestArrayProcessing < Test::Unit::TestCase
+
+  def setup
+    @t = ArduinoSketch.new
+    # vars
+  end
+  
+  # with July 25 2008 rework of arrays, this needs reworking/pruning
+  
+  def test_int_array
+    name = "foo_a"
+    value_string = "int tomatoes[]"
+    expected = "int tomatoes[];"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_int_array_with_semi
+    name = "foo_b"
+    value_string = "int tomatoes[];"
+    expected = "int tomatoes[];"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_int_array_with_assignment
+    name = "foo_c"
+    value_string = "int tomatoes[] = {1,2,3,4}"
+    expected = "int tomatoes[] = {1,2,3,4};"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_int_array_with_assignment_and_semi
+    name = "foo_d"
+    value_string = "int tomatoes[] = {1,2,3};"
+    expected = "int tomatoes[] = {1,2,3};"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_unsigned_int_array
+    name = "foo_e"
+    value_string = "unsigned int tomatoes[]"
+    expected = "unsigned int tomatoes[];"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_unsigned_int_array_with_assignment
+    name = "foo_f"
+    value_string = "unsigned int tomatoes[] = {1,2,3};"
+    expected = "unsigned int tomatoes[] = {1,2,3};"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  ### adding defines
+  
+  def test_define_numbers
+    name = "foo_g"
+    value_string = "NUMBERS 10"
+    expected = "#define NUMBERS 10"
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_numbers_type
+    name = "foo_gg"
+    value_string = "NUMBERS 10"
+    expected = "long"
+    result = @t.define(value_string)
+    assert_equal(expected, result[1])
+  end
+  
+  def test_define_value_type_long_via_gvar
+    name = "foo_ggg"
+    value_string = "NUMBERS 10"
+    expected = "long"
+    result = @t.define(value_string)
+    assert_equal(expected, $define_types["NUMBERS"])
+  end
+  
+  def test_define_string
+    name = "foo_h"
+    value_string = "TEXT word"
+    expected = "#define TEXT \"word\""
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_string_type
+     name = "foo_hh"
+     value_string = "TEXT word"
+     expected = "str"
+     result = @t.define(value_string)
+     assert_equal(expected, result[1])
+   end
+   
+   def test_define_string_type__via_gvar
+     name = "foo_hhh"
+     value_string = "TEXT word"
+     expected = "str"
+     result = @t.define(value_string)
+     assert_equal(expected, $define_types["TEXT"])
+   end
+  
+  def test_define_stings_with_spaces
+    name = "foo_i"
+    value_string = "TEXT words with spaces"
+    expected = "#define TEXT \"words with spaces\""
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_stings_with_spaces_type
+    name = "foo_ii"
+    value_string = "TEXT words with spaces"
+    expected = "str"
+    result = @t.define(value_string)
+    assert_equal(expected, result[1])
+  end
+  
+  def test_define_stings_with_spaces_type_via_gvar
+    name = "foo_iii"
+    value_string = "TEXT words with spaces"
+    expected = "str"
+    result = @t.define(value_string)
+    assert_equal(expected, $define_types["TEXT"])
+  end
+  
+  def test_define_float
+    name = "foo_j"
+    value_string = "FLOAT 10.0"
+    expected = "#define FLOAT 10.0"
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_float_type
+    name = "foo_jj"
+    value_string = "FLOAT 10.0"
+    expected = "float"
+    result = @t.define(value_string)
+    assert_equal(expected, result[1])
+  end
+
+  
+  def test_define_float_type_via_gvar
+    name = "foo_jjj"
+    value_string = "FLOAT 10.0"
+    expected = "float"
+    result = @t.define(value_string)
+    assert_equal(expected, $define_types["FLOAT"])
+  end
+  
+#
+  
+  
+  
+  
+  
+  
+  
+  
+  # question for brian... do we need variable assignment with no value when
+  # we have "" and 0
+end

data/test/test_plugin_loading.rb

@@ -0,0 +1,151 @@
+#!/usr/local/bin/ruby -w
+
+$TESTING = true
+
+# this is a test stub for now
+# lets review these
+# neee to remove this constant from tests and pull it from rad
+PLUGIN_C_VAR_TYPES = "int|void|unsigned|long|short|uint8_t|static|char\\*|byte"
+
+require "rubygems"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_processor.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_rewriter.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_type_checker.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/variable_processing"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_sketch"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_plugin"
+require 'test/unit'
+
+
+
+
+class TestPluginLoading < Test::Unit::TestCase
+
+  
+
+
+  def setup
+    $external_var_identifiers = ["__foo", "__toggle", "wiggle"]   
+    $define_types = { "KOOL" => "long", "ZAK" => "str"}
+    $array_types = { "my_array" => "int"}  
+    $plugin_directives = []
+    $plugin_external_variables = []
+    $plugin_signatures =[]
+    $plugin_methods = []
+    $add_to_setup = []
+    $load_libraries = []
+    $plugin_structs = {}
+    $plugin_methods_hash = {}  
+    $plugins_to_load = []  
+    plugin_signatures = []
+    plugin_methods = []
+     
+    @plugin_string =<<-STR
+    class PluginTesting < ArduinoPlugin
+
+
+
+     #
+     #
+     #  BlinkM_funcs.h -- Arduino library to control BlinkM
+     #  --------------
+     #
+     #
+     #  Note: original version of this file lives with the BlinkMTester sketch
+     #
+     #  2007, Tod E. Kurt, ThingM, http://thingm.com/
+     #
+     #  version: 20080203
+     #
+     #  history:
+     #   20080101 - initial release
+     #   20080203 - added setStartupParam(), bugfix receiveBytes() from Dan Julio
+     #	20080727 - ported to rad jd barnhart
+     #
+     #   first step, declare output pin 19 as i2c
+     ##  output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
+
+
+     include_wire
+
+     add_blink_m_struct
+
+
+
+     # Not needed when pin is declared with :enable => :true 
+
+     static int BlinkM_sendBack(byte addr)
+     {
+       int num = 0x11;
+       char buf[5];
+       itoa(num, buf, 16);
+       return "cool"
+     }
+ 
+     static char* another_method(byte addr)
+     {
+       int num = 0x11;
+       char buf[5];
+       itoa(num, buf, 16);
+       return "cool"
+     }
+
+    end
+    STR
+
+    @sketch_string =<<-STR
+    class SanMiquel < ArduinoSketch
+
+     # looking for hints?  check out the examples directory
+     # example sketches can be uploaded to your arduino with
+     # rake make:upload sketch=examples/hello_world
+     # just replace hello_world with other examples
+
+       def loop
+         delay 100
+         my_lcd.home "k"
+         my_lcd.setxy 0,1
+
+         BlinkM_sendBack 10
+         delay 1000
+         test_address
+       end
+
+
+    end
+
+    STR
+    
+  end
+  
+  # remove these external variables and parens on variables
+  # need to actually run code through ruby_to_c for some of these tests
+  
+  def test_int
+    name = "foo_a"
+    # check_for_plugin_use(sketch_string, plugin_string, file_name)
+    ArduinoPlugin.check_for_plugin_use(@sketch_string, @plugin_string, "hello_plugins")
+    value_string = "int(__toggle = 0);"
+    expected =  ["hello_plugins"]
+    result = $plugins_to_load
+    assert_equal(expected, result)
+  end
+  
+  def test_two
+    name = "foo_a"
+    # check_for_plugin_use(sketch_string, plugin_string, file_name)
+    ArduinoPlugin.check_for_plugin_use(@sketch_string, @plugin_string, "hello_plugins")
+    value_string = "int(__toggle = 0);"
+    expected = {"hello_plugins"=>["BlinkM_sendBack", "another_method"]}
+    result = $plugin_methods_hash
+    assert_equal(expected, result)
+  end
+  
+  
+  
+  ## need to look at unsigned long 
+  ## need parens removal tests
+  
+
+
+end