spitewaste 0.1.007 → 0.1.012

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
@@ -57,14 +57,14 @@ module Spitewaste
     private
 
     def preprocess!
-      @src.prepend "import syntax\n"
+      @src << "\nimport syntax"
       resolve_imports
       seed_prng if @seen.include? 'random'
       resolve_strings
-      remove_comments
       add_sugar
-      fucktionalize
+      remove_comments
       propagate_macros
+      fucktionalize
     end
 
     def resolve_imports
@@ -78,7 +78,13 @@ module Spitewaste
       while @src['import']
         imports = []
         @src.gsub!(/import\s+(\S+).*/) {
-          imports << resolve($1) if @seen.add? $1
+          if $1 == ?*
+            imports = Dir[LIBSPW + '/*.spw'].map {
+              File.read(_1) if @seen.add? File.basename(_1, '.spw')
+            }
+          else
+            imports << resolve($1) if @seen.add? $1
+          end
           '' # remove import statement
         }
         @src << imports.join(?\n)
@@ -91,7 +97,7 @@ module Spitewaste
     end
 
     def seed_prng
-      @src.prepend "push $seed,#{rand 2**31} store $seed = -9001"
+      @src.prepend "push $seed,#{rand 2**31} store $seed = -9001\n"
     end
 
     def resolve_strings
@@ -160,7 +166,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.007'
+  VERSION = '0.1.012'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.007
+  version: 0.1.012
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-01-01 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