rubymacros 0.1.5 → 0.1.6

data/test/test_all.rb

@@ -1,3 +1,28 @@
-require 'test/test_form'
-require 'test/test_expand'
+=begin
+    rubymacros - a macro preprocessor for ruby
+    Copyright (C) 2008, 2016  Caleb Clausen
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+$:<<File.expand_path(File.dirname(__FILE__))
+require 'test_form'
+require 'test_expand'
+
+#require 'test_unroll'
+
+#require 'macro'
+#Macro.
+require 'test_examples'
 

data/test/test_examples.rb

@@ -0,0 +1,91 @@
+=begin
+    rubymacros - a macro preprocessor for ruby
+    Copyright (C) 2008, 2016  Caleb Clausen
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+require 'test/unit'
+require "macro"
+
+  def def_example_test(name,expect)
+      define_method "test_example_#{(name).gsub('/','Y')}" do
+        out,err=capture_std_out_err{
+          load name
+        }
+#        p [expect,out]
+        assert_equal expect,out
+        assert empty_but_for_warns?(err), "expected no warnings, but saw these:\n"+err.gsub!(/^/,"  ")
+      end
+  end
+
+  def capture_std_out_err #dangerous... hard to debug
+    old={:O=>STDOUT.dup,:o=>$stdout,:E=>STDERR.dup,:e=>$stderr}
+    o1,o2=IO::pipe
+    e1,e2=IO::pipe
+    STDOUT.reopen(o2)
+    STDERR.reopen(e2)
+    $stdout=STDOUT
+    $stderr=STDERR
+    begin
+      yield
+    ensure
+      STDOUT.reopen old[:O]
+      STDERR.reopen old[:E]
+      $stdout,$stderr=old[:o],old[:e]
+    end
+
+    o2.close; e2.close
+    out=o1.read
+    err=e1.read 
+    o1.close; e1.close
+
+    return out,err
+  end
+
+  def empty_but_for_warns? str
+    str=str.dup
+    str.gsub!(/^([^:]+:\d+: warning: .*)$/){STDERR.puts $1;''}
+    str.gsub!(/\n{2,}/,"\n")
+    /\A\Z/===str
+  end
+
+class ExamplesTest<Test::Unit::TestCase
+  def setup
+    Macro.delete_all!
+  end
+
+  def self.example_dir
+    macropath=$LOADED_FEATURES.grep(/macro\.rb$/)[0]
+    unless %r{^[/\\]}===macropath
+      macropath=$LOAD_PATH.find{|dir| File.exist? dir+"/macro.rb"}
+    else
+      macropath=File.dirname(macropath)
+    end
+    File.dirname(macropath)+"/example/"
+  end
+
+  StringNode=RedParse::StringNode
+  can=File.read(example_dir+"/expected_output.txt").gsub(/^#.*$/,'').split(/^(.*) :\n/)
+  can.shift
+  #code=:()
+#  warn "unroll example disabled for now"
+  while name=can.shift
+    expect=can.shift
+    #code+=:(
+    def_example_test(name,expect) #unless /unroll/===name
+  end
+  #Macro.eval code
+  
+end

data/test/test_expand.rb

@@ -1,6 +1,6 @@
 =begin
     rubymacros - a macro preprocessor for ruby
-    Copyright (C) 2008  Caleb Clausen
+    Copyright (C) 2008, 2016  Caleb Clausen
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
@@ -19,11 +19,18 @@
 # TODO: add a test for a method definition inside of a method definition
 # to ensure that the inner method definition is properly postponed
 
+$VERBOSE=1
 
 
 require 'test/unit'
 require "macro"
+
+
 class ExpandTest < Test::Unit::TestCase
+  def setup
+    Macro.delete_all!
+  end
+
   def test_simple_expand
     Macro.eval "macro simple(a,b) :(^a+^b) end"
     ttt=RedParse::CallNode[nil, "p", [RedParse::CallNode[nil, "simple", [RedParse::LiteralNode[1], 
@@ -36,4 +43,52 @@ class ExpandTest < Test::Unit::TestCase
     ttt.macro_expand(Macro::GLOBALS,{})
     assert_equal ttt.unparse,'p((1+2))'
   end
+
+  def test_expands_to_nil
+    Macro.eval "macro nilmacro; nil end"
+    tree=Macro.parse "foo; nilmacro; bar"
+    tree=Macro.expand tree
+    assert RedParse::SequenceNode===tree
+    assert_equal 2, tree.size
+    assert RedParse::CallNode===tree.first
+    assert_equal "foo", tree.first.name
+    assert RedParse::CallNode===tree.last
+    assert_equal "bar", tree.last.name
+   
+    tree=Macro.parse "nilmacro; bar"
+    tree=Macro.expand tree
+    tree=tree.first if RedParse::SequenceNode===tree and tree.size==1
+    assert RedParse::CallNode===tree
+    assert_equal "bar", tree.name
+   
+    tree=Macro.parse "foo; nilmacro"
+    tree=Macro.expand tree
+    tree=tree.first if RedParse::SequenceNode===tree and tree.size==1
+    assert RedParse::CallNode===tree
+    assert_equal "foo", tree.name
+   
+    tree=Macro.parse "nilmacro"
+    tree=Macro.expand tree
+    assert RubyMacros::JustNilNode===tree
+    assert_equal tree.unparse, 'nil'
+
+    tree=Macro.parse "if nilmacro; p :oops; end"
+    tree=Macro.expand tree
+    assert RedParse::IfNode===tree
+    assert RubyMacros::JustNilNode===tree.condition
+    assert_equal  'if nil;p :oops;;end', tree.unparse
+  end
+
+  def test_unparse_form_escape_on_assign_lhs
+    tree=Macro.parse "(^a)=^b"
+    assert_match( /\(\^a\) *= *\^b/, tree.unparse )
+
+    tree=Macro.parse '(^x),(^w), =^y'
+    assert_match( /\(\^x\), \(\^w\), *= *\^y/, tree.unparse )
+  end
+
+  def test_call_method_on_form
+    $bar=2
+    assert_operator 0, :<, Macro.eval( ":(foo ^$bar).size" )
+  end
 end

data/test/test_form.rb

@@ -1,6 +1,6 @@
 =begin
     rubymacros - a macro preprocessor for ruby
-    Copyright (C) 2008  Caleb Clausen
+    Copyright (C) 2008, 2016  Caleb Clausen
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published by
@@ -16,6 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
+$VERBOSE=1
 
 require "macro"
 require 'test/unit'
@@ -26,10 +27,30 @@ require 'pp'
 
 
 class FormTest< Test::Unit::TestCase
+  def setup
+    Macro.delete_all!
+  end
+
   EXAMPLES=TestCases::TESTCASES
 
-  EXAMPLES.each_with_index{|x,i|
+  SLOW=ENV['SLOW']
+
+  warn "some form tests disabled; set SLOW to enable them" unless SLOW
+  warn "some Macro.expand tests disabled; set SLOW to enable them" unless SLOW
+
+  nullfile= File.open(File.exist?( "/dev/null" )? "/dev/null" : "dev_null","w")
+
+  EXAMPLES.uniq.each_with_index{|x,i|
     next if /__END__/===x
+    begin
+      #old_VERBOSE=$VERBOSE;$VERBOSE=false
+      oldSTDERR=STDERR.dup; STDERR.reopen(nullfile)
+      catch(:foo){ eval "BEGIN{throw :foo};"+x }
+    rescue SyntaxError
+      next
+    #ensure $VERBOSE=old_VERBOSE
+    ensure STDERR.reopen(oldSTDERR)
+    end
     if / \^[^\s]/===x #and x.size>1000
       while x['^']
         warn "disabling tests of '#{x[/^.*\^.*$/]}'"
@@ -37,22 +58,52 @@ class FormTest< Test::Unit::TestCase
       end
       next
     end
-    define_method "test_form_around_#{x.gsub(/[^ -~]/){|ch| "\\x"+ch[0].to_s(16)}}" do
+    x.gsub!('v','vv')  #hacky
+    escaped=x.gsub(/[^ -~]/){|ch| 
+      ch=ch[0]
+      ch=ch.getbyte 0 if ch.respond_to? :getbyte
+      "\\x"+ch.to_s(16)
+    }
+    define_method "test_form_around_#{escaped}" do
       check x
-    end
+    end if SLOW or rand<0.5
+    define_method "test_form_and_escape_around_#{escaped}" do
+      if /\A *undef /===x
+        err=RedParse::ParseError
+      end
+      begin
+        check_for_syntax_error x
+      rescue err||NilClass #ignore
+      else fail "#{err} expected, but none occurred"  if err
+      end
+    end if SLOW or rand<0.5 unless /\A\s*(?:=begin|return|next|break)/===x
+    define_method "test_form_and_call_and_escape_around_#{escaped}" do
+      if /\A *undef /===x
+        err=RedParse::ParseError
+      end
+      begin
+        check_for_syntax_error x, ":(foo(^","\n))"
+      rescue err||NilClass #ignore
+      else fail "#{err} expected, but none occurred"  if err
+      end
+    end if SLOW or rand<0.5 unless /\A\s*(?:=begin|return|next|break)/===x
+    define_method "test_Macro.expand_of_#{escaped}" do
+      check_for_syntax_error x,"",""
+    end if SLOW or rand<0.5
   }
+  warn "#{__FILE__}:#{__LINE__}: warning: tests of :(^...) and Macro.expand are weak"
 
-  def check(code)
-    begin
+  def check(code,pre="\n",post="\n")
+    #begin
 #      puts code
-      begin  as_form=Macro.eval(":(\n"+code+"\n)")
+      begin  as_form=Macro.eval(":("+pre+code+post+")")
       rescue Exception=>formexc
        0
       end
 
       begin  
         as_tree=RedParse.new("  \n"+code).parse
-        as_tree=RedParse::VarLikeNode["nil", {:@value=>false}] if RedParse::NopNode===as_tree
+        as_tree=RedParse::SequenceNode[] if RedParse::NopNode===as_tree
       rescue Exception=>treeexc
        0
       end
@@ -63,17 +114,44 @@ class FormTest< Test::Unit::TestCase
 #      as_form.delete_extraneous_ivars! if as_form
 #      as_tree.delete_extraneous_ivars! if as_tree
 
+      if as_tree and as_form and as_tree.offset != as_form.offset
+        warn "form and parse tree did not have same offsets, input: '#{code}'"
+        as_form.instance_variable_set :@offset, as_tree.offset
+      end
       assert_equal as_tree, as_form
 
       assert_equal as_form, as_form.deep_copy if as_form
-    end
+    #end
+  end
+  def check_for_syntax_error(code,pre=":(^",post="\n)")
+#      puts code
+      as_form=Macro.expand(pre+code+post)
+
+      assert_equal as_form, as_form.deep_copy
+      assert_unparses_wo_syntax_error(as_form) #weak weak
+  end
+
+  @@auwose=0
+  def assert_unparses_wo_syntax_error(tree) #weak test
+      warn "using assert_unparses_wo_syntax_error, which is weak" if (@@auwose+=1)==1
+      catch(:foo){
+        old_STDERR=$stderr
+        $stderr=open("/dev/null",'w') if File.exist? "/dev/null"
+        begin  
+          eval "BEGIN{throw :foo};"+tree.unparse #weak test
+        ensure $stderr=old_STDERR if File.exist? "/dev/null"
+        end
+      } 
   end
 end
 
 class FormParameterTest< Test::Unit::TestCase
+  def setup
+    Macro.delete_all!
+  end
   DATA=[
     "1", "1.1", "nil", "false", "true",
-    ":sym", "[1,2,3]", "{'a'=>4,:b=>6}", "'s'", 
+    "[1,2,3]", "{'a'=>4,:b=>6}", "'s'", 
   ]
   DIFFICULT_CHILDREN=[
     "RedParse::ConstantNode[nil,'Object']","(a=[];a<<a)"
@@ -107,4 +185,24 @@ class FormParameterTest< Test::Unit::TestCase
       assert_equal( $b.inspect, $a.inspect) #byaah, not the best way....
     }
   end
+
+  def test_escape_from_inner_form
+    Macro.parse ":(:(ielf=^rec))"
+    Macro.eval ":(:(ielf=^rec))"
+  end
+
+  def test_marshal_of_form_param_with_hash
+
+    #why is this failing??? seems like a marshal bug??
+    #seems to be fixed in mri 1.9.2
+    tree=Macro.parse ":(^{'ffdf'=>4})"
+    assert_nothing_raised{
+      dumped=Marshal.dump tree
+      Marshal.load dumped
+    }
+    assert_nothing_raised{
+      dumped=Marshal.dump tree
+      Marshal.load dumped
+    }
+  end
 end

data/test/test_unroll.rb

@@ -0,0 +1,120 @@
+=begin
+    rubymacros - a macro preprocessor for ruby
+    Copyright (C) 2008, 2016  Caleb Clausen
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+require 'test/unit'
+require 'macro'
+Macro.require 'example/unroll'
+
+class UnrollTest<Test::Unit::TestCase
+  def setup
+    Macro.delete_all!
+  end
+
+  def setup(seed=Time.now.to_i)
+    srand(seed)
+    @data=loop()
+  end
+
+  def choose(list)
+    list[rand(list.size)]
+  end
+
+  def loop
+    choose(LOOPS).
+      gsub!("<<<cond>>>", loop_condition).
+      gsub!("<<<body>>>", loop_body)
+  end
+
+  def loop_condition
+    choose(LOOP_CONDITIONS)
+  end
+
+  def loop_body max=4
+    x=rand(20)
+    size=
+    if x==0; 0
+    else case x/2
+         when 1; 1
+         when 2; 2
+         when 9; 10
+         else 4
+         end
+    end
+    result=(1..size).map{ choose(LOOP_BODY_PARTS) }.join("\n")
+    if max>=0
+      result.gsub!("<<<body>>>", loop_body(max-1))
+    else
+      result.gsub!("<<<body>>>", "nil")
+    end
+    result.gsub!("redo(","log(")
+    result
+  end
+
+  LOOPS=[
+    "while <<<cond>>>\n  <<<body>>>\nend\n",
+    "until <<<cond>>>\n  <<<body>>>\nend\n",
+    "(\n<<<body>>>\n)while <<<cond>>>\n",
+    "(\n<<<body>>>\n)until <<<cond>>>\n",
+    "begin\n<<<body>>>\nend while <<<cond>>>\n",
+    "begin\n<<<body>>>\nend until <<<cond>>>\n",
+  ]
+  LOOP_CONDITIONS=[
+    "true", "false", "rand<0.5", "rand<0.95"
+  ]
+  LOOP_BODY_PARTS=[
+    "log(rand(100))", 
+    "<<<fctl>>> if(rand<0.5)", 
+    "<<<fctl>>> unless(rand<0.5)", 
+    "<<<fctl>>>(<<<body>>>) if(rand<0.5)", 
+    "<<<fctl>>>(<<<body>>>) unless(rand<0.5)", 
+    "if(rand<0.5)\n  <<<body>>>\nend", 
+    "unless(rand<0.5)\n  <<<body>>>\nend", 
+    "log((<<<body>>>))",
+  ]
+  
+  FCTLS=%w[break next redo]
+
+  def clear_log; @log=[] end
+  def log x; @log<<x end
+
+  def test_unroll
+    10.times{ 
+      clear_log
+      normal=eval(@data)
+      nlog=@log
+
+      clear_log
+      macrod=Macro.eval("unroll #@data") 
+      mlog=@log
+
+      assert_equal normal,macrod
+      assert_equal nlog,mlog
+    }
+  end
+
+  def test_unroll_thorough times=1000,keys=(1..times).map{rand(0x1_0000_0000)}
+    keys.each{|key| 
+      begin
+        setup key
+        test_unroll
+      rescue Exception=>e
+        raise e.class,"using setup key #{key}"+e.message,e.backtrace
+      end
+    }
+  end
+end