spitewaste 0.2.0 → 0.2.5

data/lib/spitewaste/parsers/spitewaste.rb

@@ -118,9 +118,9 @@ module Spitewaste
       # quick push (`push 1,2,3` desugars to individual pushes)
       @src.gsub!(/push \S+/) { |m| m.split(?,) * ' push ' }
       # quick store (`^2` = `push 2 swap store`)
-      @src.gsub!(/\^(-?\d+)/, 'push \1 swap store')
+      @src.gsub!(/\^(\S+)/, 'push \1 swap store')
       # quick load (`@2` = `push 2 load`)
-      @src.gsub!(/@(-?\d+)/, 'push \1 load')
+      @src.gsub!(/@(\S+)/, 'push \1 load')
     end
 
     def gensym
@@ -141,18 +141,20 @@ module Spitewaste
       parse = -> s { s.split(?,).map &:strip }
 
       # Macro "functions" get handled first.
-      @src.gsub!(/(\$\S+?)\(([^)]+)\)\s*{(.+?)}/m) {
+      @src.gsub!(/(\$\S+?)\(([^)]*)\)\s*{(.+?)}/m) {
         @macros[$1] ||= [$2, $3]; ''
       }
-      @src.gsub!(/(\$\S+?)\(([^)]+)\)/) {
+      @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] }
+        body
+          .gsub(/`(.+?)`/) { map[$1] }
+          .gsub(/#(\S+)/) { "push #{Spitewaste.strpack 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!

data/lib/spitewaste/version.rb

@@ -1,3 +1,3 @@
 module Spitewaste
-  VERSION = '0.2.0'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -89,6 +89,7 @@ files:
 - lib/spitewaste/cli/docs.rb
 - lib/spitewaste/cli/exec.rb
 - lib/spitewaste/cli/image.rb
+- lib/spitewaste/cli/version.rb
 - lib/spitewaste/emitter.rb
 - lib/spitewaste/emitters/assembly.rb
 - lib/spitewaste/emitters/codegen.rb
@@ -138,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.18
 signing_key:
 specification_version: 4
 summary: Make programming in Whitespace even better.