spitewaste 0.1.006 → 0.1.011

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
@@ -61,10 +61,10 @@ module Spitewaste
       resolve_imports
       seed_prng if @seen.include? 'random'
       resolve_strings
-      remove_comments
       add_sugar
-      fucktionalize
+      remove_comments
       propagate_macros
+      fucktionalize
     end
 
     def resolve_imports
@@ -160,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.006'
+  VERSION = '0.1.011'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.006
+  version: 0.1.011
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,6 +110,7 @@ files:
 - lib/spitewaste/libspw/stack.spw
 - lib/spitewaste/libspw/string.spw
 - lib/spitewaste/libspw/syntax.spw
+- lib/spitewaste/libspw/terminal.spw
 - lib/spitewaste/libspw/test.spw
 - lib/spitewaste/libspw/util.spw
 - lib/spitewaste/parsers/assembly.rb