gpp 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768357e29236ee25c7bdfad581346d092c16ffea
-  data.tar.gz: a17f96873ebdf6f6e8db3bd8ae108e909f4c7f36
+  metadata.gz: 539e909aab402cd55e8238e07e0f70e691716751
+  data.tar.gz: f3982fd692c0fb4df5a66b42abf53cb2d4715ee3
 SHA512:
-  metadata.gz: 85c4310438cd96db69747dca9c31c1de02dccbc385d691bacfd044722281fabff8c39210f2caa1719bfb3f755fa20015309257b1c178d1fd79df9796602ccfd9
-  data.tar.gz: 6140d1bc380ede98ca30cc49fcc2450c8799b0bc1430a6b2becea8a01bd71cf61117feeac3c96cd25dc5d471affd9419028462007265986ee1617fc518d6a527
+  metadata.gz: 29e53154b0804e2f60f62755a5ffd6b22e244f9d6f7212895076c8e9c43ae0b90ad85e8c3f5a786b917c70e2e2d8677ea22849faccc22ae5492213be6d1f812d
+  data.tar.gz: f27500f9231e066812ede4af8c26716e73cec2cb6216ee5150c9ea6275a7289f6fc7073f23d530d2c01ec9225262d88f366d7f6eb0ab4b5827122455bc66888b

data/bin/gpp

@@ -3,15 +3,26 @@ require 'gpp'
 require 'pathname'
 require 'optparse'
 
+from, to = nil, nil
+
 OptionParser.new do |opts|
   opts.version = GPP::VERSION
   opts.banner = "Usage: #{opts.program_name} [-hv] [files]"
+  opts.on "-r PATTERN" do |value|
+    _, from, to = value.split("/")
+    from = /#{from}/
+  end
 end.order!
 
 args = ARGV.empty? ? ["-"] : ARGV
 
 args.each do |arg|
   file = arg == "-" ? STDIN.read : File.read(arg)
-  rpp = GPP::Processor.new(file, STDOUT)
+  out = if from
+    File.open(arg.gsub(from, to), "w")
+  else
+    STDOUT
+  end
+  rpp = GPP::Processor.new(file, out, arg, 1)
   rpp.scan_all
 end

data/lib/gpp/processor.rb

@@ -3,10 +3,15 @@ require 'strscan'
 module GPP
   class Processor < StringScanner
 
-    def initialize (in_, out, defs = {})
+    attr_reader :path, :trace
+
+    def initialize (in_, out, path, offset, defs = {}, trace = [])
       super(in_)
       @out = out
       @defs = defs.to_h
+      @path = path
+      @offset = offset
+      @trace = trace
     end
 
     def loopcat (into = "")
@@ -40,9 +45,18 @@ module GPP
       end
     end
 
-    def scan_word (bare = /\S+/)
-      if scan(/{\n?/)
-        scan_block()
+    def indent_block (block, indent)
+      block.gsub(/^\n/, "").gsub(/\n$/, "").gsub("\n", "\n#{indent}")
+    end
+
+    def undent_block (block)
+      indent = block[/\A\n[ \t]+/]
+      indent ? block.gsub(/#{indent}/, "\n") : block
+    end
+
+    def scan_arg (bare = /\S+/)
+      if scan(/{/)
+        undent_block(scan_block())
       elsif scan(/"/)
         scan_string()
       else
@@ -52,84 +66,117 @@ module GPP
 
     def scan_args
       if scan(/\(/)
-        loopcat [] do
+        scan(/[ \t]+/)
+        loopcat [scan_arg(/[^,)]*/)] do
           if scan(/\)/)
             nil
-          else
-            scan_word(/[^,)]+/).tap do
-              scan(/,/)
-            end
+          elsif scan(/,/)
+            scan(/[ \t]+/)
+            scan_arg(/[^,)]*/)
           end
         end
       else
         loopcat [] do
-          if scan(/\n/)
+          if scan(/(?=\n)/)
             nil
           else
-            scan(/ +/)
-            scan_word
+            scan(/[ \t]+/)
+            scan_arg
           end
         end
       end
     end
 
-    def run (string, args = nil)
+    def run (string, args, path, line)
+      trace = self.trace + [tracer]
       if args == nil
-        self.class.new(string, s = "", @defs).scan_all
+        self.class.new(string, s = "", path, line, @defs, trace).scan_all
       else
-        self.class.new(string, s = "", @defs.merge(args.to_h)).scan_all
+        self.class.new(string, s = "", path, line, @defs.merge(args.to_h), trace).scan_all
       end
       s
     end
 
-    def run_block (args, body)
-      theargs = scan_args
-      run(body, args.zip(theargs))
-    end
+    Definition = Struct.new(:type, :args, :body, :path, :line)
 
     def run_macro (id)
-      if d = @defs[id]
-        if d.is_a?(String)
-          run(d)
-        else
-          theargs = scan_args
-          run(d[1], d[0].zip(theargs))
+      rpos = pos - id.length - 2
+      w = string[(string.rindex("\n", rpos) || 0) + 1..rpos][/[ \t]+/]
+      res = if d = @defs[id]
+        case d.type
+        when :var
+          run(d.body, {}, d.path, d.line)
+        when :fun
+          args = scan_args.map{|arg| Definition.new(:var, {}, run(arg, {}, path, line), path, line)}
+          if d.args[-1] == "..."
+            la = d.args.length - 1
+            args[la..-1] = Definition.new(:var, {}, args[la..-1].map(&:body).join(" "), args[la].path, args[la].line)
+          end
+          if args.length != d.args.length
+            error "wrong argument count for #{id}: expected #{d.args.length} but got #{args.length}"
+          end
+          run(d.body, d.args.zip(args), d.path, d.line)
         end
       else
-        STDERR.puts "undefined macro: #{id}"
-        exit 1
+        error "undefined macro: #{id}"
       end
+      indent_block(res, w)
     end
 
     def scan_define
+      line = self.line
       name, *args, body = scan_args
-      @defs[name] = [args, body]
+      if args == []
+        @defs[name] = Definition.new(:var, nil, body, @path, line)
+      else
+        @defs[name] = Definition.new(:fun, args, body, @path, line)
+      end
     end
 
     def scan_import ()
       args = scan_args
       args.each do |arg|
-        run File.read(arg)
+        run File.read(arg), nil, arg, 1
       end
     end
 
     def scan_all
-      scan(/\s+/)
       while !eos?
         @out << (scan(/[^#@]+/) || "")
         if scan(/#define\b/)
           scan_define
+          scan(/\s+/)
         elsif scan(/#import\b/)
           scan_import
+          scan(/\s+/)
+        #elsif scan(/#(\w+)/)
+        #  error "undefined meta-macro: #{self[1]}"
         elsif scan(/@@/)
           @out << "@"
-        elsif scan(/@(\w+)/)
+        elsif scan(/@(\.\.\.|\w+)/)
           @out << (run_macro(self[1]) || "")
-        else
-          scan(/./)
+        elsif s = scan(/./)
+          @out << s
         end
       end
     end
 
+    def line
+      @offset + string[0..pos - 1].count("\n")
+    end
+
+    def tracer
+      [path, line]
+    end
+
+    def error (message)
+      STDERR.puts "#{message}"
+      STDERR.puts " in #{path}:#{line}"
+      trace.reverse.each do |path, line|
+        STDERR.puts "    #{path}:#{line}"
+      end
+      exit 1
+    end
+
   end
 end

data/lib/gpp/version.rb

@@ -1,3 +1,3 @@
 module GPP
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies: []
 description: A text pre-processor
 email: n@p12a.org.uk