rubymacros 0.1.5 → 0.1.6

data/lib/macro/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
@@ -20,11 +20,13 @@
 #$: << "../redparse/lib"
 
 require "redparse"
-require "macro"
+#require "macro"
 class Macro
   # The syntax node for forms
   class FormNode < RedParse::ValueNode
     param_names :text
+    alias val text
+    alias body text
 
     # Create a new form node.  The user should normally not call this
     # function.  Form nodes are created by the parser.
@@ -33,21 +35,66 @@ class Macro
     # +text+::  A ParenedNode or VarLikeNode
     #
     def initialize(colon,text)
+      @startline=@endline=nil
+
       # Certain node types need to be quoted
-      if RedParse::VarLikeNode===text 
+      # (or rather, not unquoted)
+      if RedParse::VarLikeNode===text
+        #this code is dead now, I believe
         @transform=HashLiteralNode[]
+        @stars_transform=HashLiteralNode[]
+        text.startline=text.endline=0
         super text
         return
       end
 
+
       # Sanity check - make sure this is a valid ParenedNode
-      fail unless ParenedNode===text && text.size==1 
-      text=text.body
+      if ParenedNode===text && text.size==1 
+        text=text.body #unquote the form
+      elsif text.size==0
+        @transform=HashLiteralNode[]
+        @stars_transform=HashLiteralNode[]
+        super SequenceNode[]
+        return
+      end
 
       super text
       rebuild_transform
     end
 
+    def noinspect_instance_variables
+      %w[@stars_transform @transform]
+    end
+
+    def initialize_copy other
+      replace other
+      other.instance_variables{|v|
+        instance_variable_set v, other.instance_variable_get(v)
+      }
+      rebuild_transform
+    end
+
+    def _dump depth
+      Marshal.dump text,depth
+    end
+
+    def self._load str
+      result=allocate
+      result.replace [Marshal.load(str)]
+      result.rebuild_transform
+    end
+
+=begin fake _dump/_load, for testing purposes
+    def _dump depth
+      "foobarbaz"
+    end
+
+    def self._load str
+      result=allocate
+    end
+=end
+
     def initialize_ivars
       rebuild_transform
       super
@@ -58,15 +105,17 @@ class Macro
     def rebuild_transform
       # TODO: this method needs to be better documented/refactored
       @transform=HashLiteralNode[]
+      @stars_transform=HashLiteralNode[]
       @parameters=[]
+      @parameters.extend RedParse::ListInNode
 
       walkers=proc{|rcvr,wraplayers| #curry
-        rcvr.walk{|*args| 
-         node=args.last
+        rcvr.walk{|parent,i,j,node| 
+         node.startline=node.endline=0 if node.respond_to? :startline
          case node
-         when FormParameterNode
+         when FormEscapeNode
            target=node.wraplevel
-           fail if wraplayers > target
+           #fail if wraplayers > target
            if wraplayers==target #skip this parameter if it doesn't have enough wrappers
              @parameters << node #remember parameter (and implicitly, location)
 
@@ -87,9 +136,13 @@ class Macro
 
       @parameters.each{|orig_escd| 
         escd=orig_escd
-        escd=escd.val while FormParameterNode===escd
-        @transform.push LiteralNode[orig_escd.__id__], escd
-      }    
+        escd=escd.val while FormEscapeNode===escd
+        if UnaryStarNode===escd
+          @stars_transform.push LiteralNode[orig_escd.__id__], escd.val
+        else
+          @transform.push LiteralNode[orig_escd.__id__], escd
+        end
+      }
 
       return self
     end
@@ -99,7 +152,7 @@ class Macro
     # +block+:: the block to call for each parameter
     #
     def each_parameter(&block)
-      @parameters.each(&block) if @parameters
+      @parameters.each(&block) if defined? @parameters
     end
 
     # Make a deep copy of this form
@@ -125,7 +178,9 @@ class Macro
     #
     # +transform+:: the transform to use in the deep copy
     #
-    def reify transform
+    def reify transform, stars_transform
+      transform&&=transform.dup
+      stars_transform&&=stars_transform.dup
       transform.each_pair{|k,v|
         case v
         when Node; next
@@ -134,7 +189,32 @@ class Macro
         end
         transform[k]=v
       }
-      deep_copy(transform)
+      stars_transform.each_pair{|k,v|
+        case v
+        when Symbol; v=CallNode[nil,v.to_s]
+        else v=Macro.quote v
+        end
+        stars_transform[k]=v.extend InlineList
+      }
+      result=deep_copy(transform.merge( stars_transform ))
+      #expand InlineLists somehow
+      result.walk{|parent,i,j,node|
+        if InlineList===node
+          if j
+            parent[i][j,1]=*node
+          else
+            parent[i,1]=*node
+          end
+          nil #halt further recursion
+        else
+          true
+        end
+      } unless stars_transform.empty?
+      
+      return result
+    end
+
+    module InlineList
     end
 
     # Transform this node into a ParseTree parse tree
@@ -171,27 +251,55 @@ class Macro
     #   RedParse::SomeNodeType[ some transform of code ]
     #
     def parses_like
-      CallSiteNode[CallSiteNode[formname, "reify", [@transform]], "text"]
-      #:(^(formname).reify(^@transform).text)
+      startline=@startline if defined? @startline
+      endline=@endline if defined? @endline
+      ivars={:@startline=>startline, :@endline=>endline}
+      CallSiteNode[
+        CallSiteNode[formname, "reify", [@transform,@stars_transform], ivars], 
+        "text", ivars
+      ]
+      #:(^(formname).reify(^@transform,^@stars_transform).text)
     end
     
     # Lazily evaluate the name of the form and return it
     def formname
-      @formname ||= ConstantNode[nil,"Macro","Names",::Macro::Names.request(self)]
+      startline=@startline if defined? @startline
+      endline=@endline if defined? @endline
+      ivars={:@startline=>startline, :@endline=>endline}
+
+      @formname ||= ConstantNode[nil,"Macro","Names",::Macro::Names.request(self), ivars]
     end
   end
 
 
   # The syntax node for a form escape
-  class FormParameterNode < RedParse::ValueNode
+  class FormEscapeNode < RedParse::ValueNode
     param_names :val
+    alias body val
 
+=begin not needed now?
+    def initialize(*args)
+      super(args.last)    
+    end
+=end
     # Called by the parser to create a new form parameter node.
     #
-    # +args+:: TODO
+    # +args+:: the ^ token (unused), and its argument
     #
-    def initialize(*args)
-      super(args.last)    
+
+
+    def self.create(*args)
+      v=args.last
+      case v
+      when UndefNode; v=MisparsedNode.new('',v,'')
+      when KeywordToken
+        case v.ident
+        when /\A(?:;|\+>)\z/; v=args[-2]
+        when ')'; huh "v foo;(*params) unhandled yet"
+        else fail
+        end
+      end
+      new v
     end
 
     # Performs the reverse of a parse operation (turns the node into a
@@ -203,15 +311,16 @@ class Macro
       "^"+val.unparse(o)      
     end
 
+    def lhs_unparse o=default_unparse_options
+      "(^"+val.unparse(o)+")"
+    end
+
     # The number of carats (^) that occur in the escape.  Note that
     # this method is recursive.
     def wraplevel
-      return val.wraplevel+1 if FormParameterNode===val
+      return val.wraplevel+1 if FormEscapeNode===val
       return 1
     end
-
-    def inspect
-      val.unparse
-    end
   end
+  FormParameterNode=FormEscapeNode
 end

data/lib/macro/node.rb

@@ -0,0 +1,64 @@
+=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
+
+class RedParse
+class Node
+  def replace_flow_control(replacer)
+    fail "retry is hard! & changes semantics in ruby 1.9" if replacer[:retry]
+    return_yield={}
+    return_yield[:return]=replacer[:return] if replacer[:return]
+    return_yield[:yield]=replacer[:yield] if replacer[:yield]
+    walk{|parent,i,j,node|
+      case node
+      when KWCallNode
+        if action=replacer[node.name.to_sym]
+          newnode=action[*node.params]
+          if j
+            parent[i][j]=newnode
+          else
+            parent[i]=newnode
+          end
+        end
+        true
+      when LoopNode, UntilOpNode, WhileOpNode
+        #nested loops hide break/next/redo
+        node.condition.replace_flow_control(replacer)
+        node.body.replace_flow_control(return_yield) if node.body and !return_yield.empty?
+        false
+      when MethodNode,ClassNode,ModuleNode,MetaClassNode
+        node.receiver.replace_flow_control(replacer) if node.receiver
+        #but not in body, rescues, else, ensure
+        false
+      when CallNode
+        node.receiver.replace_flow_control(replacer) if node.receiver
+        node.params.each{|param| param.replace_flow_control(replacer) } if node.params
+        #but only return/yield in block or blockparams
+        unless return_yield.empty?
+          node.blockparams.each{|bparam| bparam.replace_flow_control(return_yield) } if node.blockparams
+          node.block.replace_flow_control(return_yield) if node.block
+        end
+        false
+      when Macro::FormNode
+        #should really recurse in corresponding form escapes....
+        false
+      else true
+      end
+    }
+  end
+end
+end

data/lib/macro/version.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,7 +16,4 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
-
-class Macro
-  VERSION="0.1.5"
-end
+require 'rubymacros/version'

data/lib/rubymacros.rb

@@ -0,0 +1,19 @@
+=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 'macro'

data/lib/rubymacros/version.rb

@@ -0,0 +1,23 @@
+=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
+
+
+class Macro
+  VERSION="0.1.6"
+end
+RubyMacros=Macro

data/lib/weakkeyhash.rb

@@ -1,3 +1,21 @@
+=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
+
 class WeakKeyHash<Hash
   def initialize(&block)
     super

data/rubymacros.gemspec

@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+=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
+
+dir=File.dirname(__FILE__)
+require "#{dir}/lib/rubymacros/version"
+RubyMacros::Description=open("#{dir}/README.txt"){|f| f.read[/^==+ ?description[^\n]*?\n *\n?(.*?\n *\n.*?)\n *\n/im,1] }
+RubyMacros::Latest_changes="###"+open("#{dir}/History.txt"){|f| f.read[/\A===(.*?)(?====)/m,1] }
+
+Gem::Specification.new do |s|
+  s.name = "rubymacros"
+  s.version = RubyMacros::VERSION
+  s.date = Time.now.strftime("%Y-%m-%d")
+  s.authors = ["Caleb Clausen"]
+  s.email = %q{caleb (at) inforadical (dot) net}
+  s.summary = "RubyMacros is a lisp-like macro pre-processor for Ruby."
+  s.description = RubyMacros::Description
+  s.homepage = %{http://github.com/coatl/rubymacros}
+  s.rubyforge_project = %q{rubymacros}
+  s.license = %q{LGPL-2.1}
+
+  s.files = `git ls-files`.split
+  s.test_files = %w[test/test_all.rb]
+  s.require_paths = ["lib"]
+  s.bindir = "bin"
+  s.extra_rdoc_files = ["README.txt", "COPYING.LGPL"]
+  s.has_rdoc = true
+  s.rdoc_options = %w[--main README.txt]
+
+  s.rubygems_version = %q{1.3.0}
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency("redparse", ['>= 1.0.0'])
+    else
+      s.add_dependency("redparse", ['>= 1.0.0'])
+    end
+  else
+    s.add_dependency("redparse", ['>= 1.0.0'])
+  end
+end