spitewaste 0.1.005 → 0.1.010

data/lib/spitewaste/parsers/spitewaste.rb

@@ -11,7 +11,7 @@ module Spitewaste
     INSTRUCTIONS = /(\S+):|(\b(#{OPERATORS_M2T.keys * ?|})\s+(-?\d\S*)?)/
     SPECIAL_INSN = /(call|jump|jz|jn)\s+(\S+)/
 
-    attr_reader :src, :instructions, :error
+    attr_reader :src, :instructions, :error, :symbol_table
 
     def initialize program, **options
       @src = program.dup
@@ -127,8 +127,22 @@ module Spitewaste
     def propagate_macros
       # Macros are write-once, allowing user code to customize the special
       # values that get used to drive certain behavior in the standard library.
+
+      parse = -> s { s.split(?,).map &:strip }
+
+      # Macro "functions" get handled first.
+      @src.gsub!(/(\$\S+?)\(([^)]+)\)\s*{(.+?)}/m) {
+        @macros[$1] ||= [$2, $3]; ''
+      }
+      @src.gsub!(/(\$\S+?)\(([^)]+)\)/) {
+        params, body = @macros[$1]
+        raise "no macro function '#$1'" unless body
+        map = parse[params].zip(parse[$2]).to_h
+        body.gsub(/`(.+?)`/) { map[$1] }
+      }
+
       @src.gsub!(/(\$\S+)\s*=\s*(.+)/) { @macros[$1] ||= $2; '' }
-      @src.gsub!(/(\$\S+)/) { @macros[$1] || raise("no macro '#{$1}'") }
+      @src.gsub!(/(\$\S+)/) { @macros[$1] || raise("no macro '#$1'") }
     end
 
     def eliminate_dead_code!
@@ -146,7 +160,7 @@ module Spitewaste
       subroutines = {}
       while label = tokens.shift
         sublen = tokens.index { |t| t[/:$/] } || tokens.size
-        subroutines[label.chop] = tokens.shift sublen
+        subroutines[label.chop] ||= tokens.shift sublen
       end
 
       # A subroutine may indirectly depend on the one immediately after by

data/lib/spitewaste/version.rb

@@ -1,3 +1,3 @@
 module Spitewaste
-  VERSION = '0.1.005'
+  VERSION = '0.1.010'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.005
+  version: 0.1.010
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake