rubymacros 0.1.3 → 0.1.4

data/History.txt

@@ -1,6 +1,16 @@
-=== 0.1.2 / 2009-04-26
+=== 0.1.4 / 2009-05-21
+* 1 Major Enhancement:
+  * line numbers are now preserved in preprocessed code; 
+  *   backtraces should make more sense.
+* 1 Minor Enhancement:
+  * updated to keep in sync with the latest RedParse api (sigh)
+
+=== 0.1.3 / 2009-05-02
+* 1 Minor Enhancement:
+  * depend on redparse>=0.8.1, since 0.8.0 had a stupid permission problem
 
-* 7 minor enhancements
+=== 0.1.2 / 2009-04-26
+* 7 Minor Enhancements
   * lots of nice comments added, thanks to Paul Brannan and Tatsuji Kawai
   * Paul fixed the weird rdoc failure too!
   * incorrect warning removed
@@ -10,7 +20,6 @@
   * all files should be world-readable now
 
 === 0.1.0 / 2008-10-24
-
-* 1 major enhancement
+* 1 Major Enhancement
   * Birthday!
 

data/Manifest.txt

@@ -2,7 +2,6 @@ COPYING.LGPL
 Manifest.txt
 README.txt
 History.txt
-rubymacros.vpj
 Rakefile
 test/test_form.rb
 test/test_expand.rb
@@ -23,3 +22,7 @@ example/with_wrap.rb
 example/linenum.rb
 example/linenum_user.rb
 example/linenum_wrap.rb
+example/andand_wrap.rb
+lib/weakkeyhash.rb
+test/test_all.rb
+TODO

data/README.txt

@@ -1,6 +1,6 @@
 = RubyMacros
-* http://rubymacros.rubyforge.org
 * http://rubyforge.org/projects/rubymacros
+* http://github.com/coatl/rubymacros
 
 == DESCRIPTION:
 RubyMacros is a lisp-like macro pre-processor for Ruby. More than just a 
@@ -32,7 +32,6 @@ a proof of concept or toy at this point:
  * some ruby syntax is unsupported in files using macros
  * files using macros must be loaded via Macro.require;
  * Kernel#require will not recognize macros
- * RedParse Node tree format will be changing slightly
  * macros cannot be scoped
  * no variable (or other) hygiene
 
@@ -95,10 +94,12 @@ macro callsite in the parsetree which contained it.
 
 
 == Known Problems
- * need to insert extra parens around form params and macro texts
+ * need to insert extra parens around form params
  * a variety of parsetrees are kept around forever for no good reason
- * a few warnings and disabled tests in unit tests
- * however, huge rediculous piles of RedParse warnings when running 'rake test'
+ * a few disabled tests in unit tests
+ * =begin...=end in forms causes minor unit test failures
+ * unterminated string in forms is not handled well
+
 
 == License:
 Copyright (C) 2008  Caleb Clausen

data/Rakefile

@@ -2,7 +2,6 @@
 # Distributed under the terms of Ruby's license.
 require 'rubygems'
 require 'hoe'
-require 'lib/macro/version.rb'
  
 
 if $*==["test"]
@@ -16,6 +15,8 @@ if $*==["test"]
   exit
 end
 
+require 'lib/macro/version.rb'
+
    readme=open("README.txt")
    readme.readline("\n== DESCRIPTION:")
    readme.readline("\n\n")
@@ -24,8 +25,8 @@ end
    hoe=Hoe.new("rubymacros", Macro::VERSION) do |_|
      _.author = "Caleb Clausen"
      _.email = "rubymacros-owner @at@ inforadical .dot. net"
-     _.url = ["http://rubymacros.rubyforge.org/", "http://rubyforge.org/projects/rubymacros/"]
-     _.extra_deps << ['redparse', '>= 0.8.1']
+     _.url = ["http://github.com/coatl/rubymacros/", "http://rubyforge.org/projects/rubymacros/"]
+     _.extra_deps << ['redparse', '>= 0.8.2']
      _.test_globs=["test/*"]
      _.description=desc
      _.summary=desc[/\A[^.]+\./]

data/TODO

@@ -0,0 +1,35 @@
+macro options
+  immediate vs delayed
+  'protected' vs unprotected macros -- params and result surrounded by ()
+  precedence for operator macros
+  hygienic vs unhygienic
+
+static selector namespaces?
+
+other types of macro:
+replacement by example -- block style
+replacement by example -- form with matchers in form escapes
+straight out Reg::Transform expression as macro
+operator macros
+lmacros
+
+parser extensions to make the language more macro-friendly:
+dynamically named callsites:  rcvr.( a<b ? :foo : :bar )(args)
+dynamically named constant lookups: Parent::(whatever)
+arbitrary expression in block slot of callsite: 
+          foo.bar(args)block
+          foo.bar(args)bl.ock
+          foo.bar(args)(...whatever)
+(but don't allow funny characters here (unless parenthesised))
+block literals. empty block is {||} 
+  else block and hash disambiguated by presence of => or :
+dynamic method names?: def (expr returning name); ... end
+
+
+cool macros to write:
+,, -- evaluates left and right sides then returns val of LEFT
+.? -- call a method if rcvr respond_to? it
+{<..>} -- ordered hash
+trace_subexpressions() -- print val of each subexpression
+better assert
+iter

data/example/andand.rb

@@ -1,3 +1,10 @@
 macro andand(a,b)
   :(^a and ^b)
 end
+
+def main
+  andand(false,puts("FAILED!!!"))
+  andand(true,puts("Success!"))
+end
+
+main #if $0==__FILE__

data/example/andand_wrap.rb

@@ -0,0 +1,2 @@
+require "macro"
+Macro.require "example/andand"

data/example/assert.rb

@@ -4,8 +4,8 @@ if $Debug
   macro assert(cond)
     if RedParse::OpNode===cond and /\A[=!]=\Z/===cond.op
       left,op,right=*cond
-      :(fail 'expected '+^left.unparse({})+"(==#{^left}) to be "+
-             ^op+" "+^right.unparse({})+"(==#{^right})" unless ^cond)    
+      :(fail 'expected '+^left.unparse+"(==#{^left}) to be "+
+             ^op+" "+^right.unparse+"(==#{^right})" unless ^cond)    
     else
       :(fail "expected #{:(^^cond)}, but was not true" unless ^cond)
     end

data/lib/macro.rb

@@ -24,7 +24,7 @@ require 'redparse'
 require "macro/form"
 require "macro/version"
 
-warn "need to insert extra parens around form params and macro texts"
+warn "need to insert extra parens around form params"
 
 class Object # :nodoc:
   #as close as I can get to an empty binding (used below in Macro.eval)
@@ -168,7 +168,7 @@ class Macro
         result={}
         seen[obj.__id__]=result
         obj.each_pair{|k,v| 
-          result[copy k]=copy v,seen
+          result[copy( k )]=copy v,seen
         }
         result
       when Module,Proc,IO,Method,
@@ -209,9 +209,9 @@ class Macro
         modpath=ConstantNode[nil,*session[:@modpath]] 
         modpath.push "Object" unless modpath.size>1
         if session[:@namespace_type]==ModuleNode
-          node=ModuleNode[modpath,node]    #:(module ^modpath; ^node; end)
+          node=ModuleNode[modpath,node,[],nil,nil]    #:(module ^modpath; ^node; end)
         else
-          node=ClassNode[modpath,nil,node] #:(class ^modpath; ^node; end)
+          node=ClassNode[modpath,nil,node,[],nil,nil] #:(class ^modpath; ^node; end)
         end 
       end
 
@@ -228,7 +228,7 @@ class Macro
             [unexpanded,  ConstantNode[nil,"Macro","GLOBALS"], 
              HashLiteralNode[LiteralNode[:@expand_in_defs], VarLikeNode["true"]], Macro.quote(filename)],
           nil,nil]
-      return CallNode[expanded,evalname,[Macro.quote filename],nil,nil]
+      return CallNode[expanded,evalname,[Macro.quote( filename )],nil,nil]
   end
 
   class Node
@@ -257,7 +257,7 @@ class Macro
 
       expanded_tree=self   #Macro.expand(deep_copy,::Macro::GLOBALS)
 
-      unparsed=expanded_tree.unparse({})
+      unparsed=expanded_tree.unparse
       #puts unparsed
       ::Kernel.eval unparsed, binding||::Object.new_binding,file||'(eval)',line||1
     end
@@ -286,7 +286,7 @@ class Macro
         true
       }
       
-      unparsed=expanded_tree.unparse({})
+      unparsed=expanded_tree.unparse
       #p expanded_tree
       #puts unparsed
       Tempfile.open("macroexpanded_"+name.gsub("/","__")){|tf|
@@ -480,8 +480,8 @@ class Macro
 
       # and keep recursing, no matter what, by all means!!
       newnode=Macro.expand newnode,macros,session #just do it here
-      return newnode,false                      #and not in caller
-      
+      newnode=OneLineParenedNode[newnode] #disable newlines in macro text
+      return newnode,false                        #and not in caller
      end
    end
 
@@ -529,7 +529,14 @@ class Macro
         end
         session[:@modpath].push *name
 
-          map!{|n| Macro.expand(n,macros,session) if n}
+        map!{|n| 
+            case n
+            when nil
+            when Node; Macro.expand(n,macros,session)
+            when Array; n.map!{|nn| Macro.expand(nn,macros,session) }
+            else fail
+            end
+        }
 
         if old_modpath
           session[:@modpath]=old_modpath
@@ -610,7 +617,7 @@ class Macro
          carets+=1
        end
        if carets==nest
-         return node.unparse({})
+         return node.unparse
        else
          return super
        end
@@ -646,7 +653,7 @@ class Macro
     #
     # +o+:: a list of options for unparse
     #
-    def unparse o
+    def unparse o=default_unparse_options
       result="macro "
       result+=receiver.unparse(o)+'.' if receiver
       result+=name
@@ -655,12 +662,23 @@ class Macro
         result+=args.map{|arg| arg.unparse o}.join','
         result+=")"
       end
-      result+="\n"
-      result+=body.unparse(o) if body
+      result+=unparse_nl(body,o)+body.unparse(o) if body
       result+=rescues.map{|resc| resc.unparse o}.to_s
-      result+="else "+else_.unparse( o )+"\n" if else_
-      result+="ensure "+ensure_.unparse( o )+"\n" if ensure_
-      result+="\nend"
+      result+=unparse_nl(else_,o)+"else "+else_.unparse( o )+"\n" if else_
+      result+=unparse_nl(ensure_,o)+"ensure "+ensure_.unparse( o )+"\n" if ensure_
+      result+=";end"
+      return result
+    end
+  end
+
+  class OneLineParenedNode < ParenedNode
+    #hacky way to get unparser to not emit newlines in most cases
+    def unparse(o=default_parse_options)
+      old_linenum=o[:linenum]
+      o[:linenum]=2**128
+      result=super(o)
+      diff=o[:linenum]-2**128
+      o[:linenum]=old_linenum+diff
       return result
     end
   end
@@ -674,7 +692,7 @@ class Macro
       [
         -[KW('macro'), KW(beginsendsmatcher).~.*, KW('end'), KW(/^(do|\{)$/).~.la]>>MisparsedNode
       ]+super+[
-        -[Op('^@'), Expr, LowerOp]>>FormParameterNode,
+        -[Op('^@'), Expr, lower_op()]>>FormParameterNode,
         -[Op(':@'), (ParenedNode&-{:size=>1})|(VarLikeNode&-{:ident=>"nil"})]>>FormNode,
         -['macro', CallSiteNode, KW(';'),
            Expr.-, RescueNode.*, ElseNode.-, EnsureNode.-,

data/lib/macro/form.rb

@@ -110,7 +110,7 @@ class Macro
     #
     # +o+:: a list of options for unparse
     #
-    def unparse o
+    def unparse o=default_unparse_options
       ":("+text.unparse(o)+")"
     end
 
@@ -193,7 +193,7 @@ class Macro
     #
     # +o+:: a list of options for unparse
     #
-    def unparse o
+    def unparse o=default_unparse_options
       "^"+val.unparse(o)      
     end
 
@@ -205,7 +205,7 @@ class Macro
     end
 
     def inspect
-      val.unparse({})
+      val.unparse
     end
   end
 end

data/lib/macro/version.rb

@@ -18,5 +18,5 @@
 
 
 class Macro
-  VERSION="0.1.3"
+  VERSION="0.1.4"
 end

data/lib/weakkeyhash.rb

@@ -0,0 +1,17 @@
+class WeakKeyHash<Hash
+  def initialize(&block)
+    super
+  end
+
+
+  def [](key)
+    super key.__id__
+  end
+
+  def []=(key,val)
+    ObjectSpace.define_finalizer(key,&method :delete)
+    super key.__id__,val
+  end
+
+  #dunno how many more methods will actually work...
+end

data/test/test_expand.rb

@@ -30,10 +30,10 @@ class ExpandTest < Test::Unit::TestCase
       RedParse::LiteralNode[2]], nil, nil]], nil, nil]
     ttt.macro_expand(Macro::GLOBALS,{})
 
-    assert_equal ttt.unparse({}),'p(1+2)'
+    assert_equal ttt.unparse,'p((1+2))'
 
     ttt=Macro.parse "p(simple(1,2))"
     ttt.macro_expand(Macro::GLOBALS,{})
-    assert_equal ttt.unparse({}),'p(1+2)'
+    assert_equal ttt.unparse,'p((1+2))'
   end
 end

data/test/test_form.rb

@@ -37,7 +37,7 @@ class FormTest< Test::Unit::TestCase
       end
       next
     end
-    define_method "test_case_#{i}" do
+    define_method "test_form_around_#{x.gsub(/[^ -~]/){|ch| "\\x"+ch[0].to_s(16)}}" do
       check x
     end
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubymacros
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Caleb Clausen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -07:00
+date: 2009-05-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -47,7 +47,6 @@ files:
 - Manifest.txt
 - README.txt
 - History.txt
-- rubymacros.vpj
 - Rakefile
 - test/test_form.rb
 - test/test_expand.rb
@@ -68,8 +67,12 @@ files:
 - example/linenum.rb
 - example/linenum_user.rb
 - example/linenum_wrap.rb
+- example/andand_wrap.rb
+- lib/weakkeyhash.rb
+- test/test_all.rb
+- TODO
 has_rdoc: true
-homepage: http://rubymacros.rubyforge.org/
+homepage: http://github.com/coatl/rubymacros/
 post_install_message: 
 rdoc_options: 
 - --main

data/rubymacros.vpj

@@ -1,87 +0,0 @@
-<!DOCTYPE Project SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpj.dtd">
-<Project
-	Version="10.0"
-	VendorName="SlickEdit"
-	WorkingDir=".">
-	<Config
-		Name="Release"
-		OutputFile=""
-		CompilerConfigName="Latest Version">
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				SaveOption="SaveNone"
-				RunFromDir="%rw">
-				<Exec/>
-			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				SaveOption="SaveNone"
-				RunFromDir="%rw">
-				<Exec CmdLine='".exe"'/>
-			</Target>
-		</Menu>
-	</Config>
-	<CustomFolders>
-		<Folder
-			Name="Source Files"
-			Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl"/>
-		<Folder
-			Name="Header Files"
-			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if"/>
-		<Folder
-			Name="Resource Files"
-			Filters="*.ico;*.cur;*.dlg"/>
-		<Folder
-			Name="Bitmaps"
-			Filters="*.bmp"/>
-		<Folder
-			Name="Other Files"
-			Filters="">
-		</Folder>
-	</CustomFolders>
-	<Files AutoFolders="DirectoryView">
-		<Folder Name="example">
-			<F N="example/assert.rb"/>
-			<F N="example/assert_wrap.rb"/>
-			<F N="example/simple.rb"/>
-			<F N="example/simple_wrap.rb"/>
-		</Folder>
-		<Folder Name="lib">
-			<Folder Name="macro">
-				<F N="lib/macro/form.rb"/>
-			</Folder>
-			<F N="lib/macro.rb"/>
-			<F N="lib/weakkeyhash.rb"/>
-		</Folder>
-		<Folder Name="test">
-			<F N="test/test_form.rb"/>
-		</Folder>
-	</Files>
-</Project>