spitewaste 0.1.002 → 0.1.003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b185ba760bbddf427962b292046de239f29b6a13964c7182eea2da1a2bcc0d10
-  data.tar.gz: 36991071a4e6bc98134d235a340dbaf90f082020ffc2e2bd8a67b83970b86e68
+  metadata.gz: 0b4f49809a688762a3b50dab64b93163e493aa75a33d2565b9892ec5ad8c9bc0
+  data.tar.gz: 6a06768b5a4edcf18ca0948900effd3c3fb01fbdea2e2da8d29080036870614f
 SHA512:
-  metadata.gz: add4543eead4effe21e7eab4ff3bd18fc6f544889368c14b2b178953adddbb1f53913dc737ebcb95ce5f49ee144c81e1916072e2c9e72752c5cb9aab5d0313d5
-  data.tar.gz: 1249b0e70507839d31c15f7fb29d084eb7b572dea51f5b398416e871b57e5d3eb621e2ed756cd5871a28a8a7ebd72bc59f1b65a8b884a441dc9de77a3e254271
+  metadata.gz: 99cc02efffe8e2ddecf76b1b8578c4eb5e3a6c96b0cf1d46d063b9268507120a718835822f906739962a0b36262ae08328c610db3b37b0a777b3ff84d5e2df02
+  data.tar.gz: fa3425ae1c074a9a34f78bf110a7d8bb645b15205bb78f68787060e61c018cf63925c2c32d67bbf5ab0d4552c37727555dfcdd384824af2b6087c665bf969233

data/Gemfile

@@ -1,8 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in spitewaste.gemspec
-
-gem 'rake', '~> 12.0'
-gem 'minitest', '~> 5.0'
-gem 'thor', '~> 1.0'
-gem 'oily_png' # TODO: optionalize?
+gemspec

data/Rakefile

@@ -14,6 +14,7 @@ task :docs do |t|
     lib = File.basename path, '.spw'
     all_docs[lib] = extract_docs path
   end
+
   File.open('docs.json', ?w) { |f| JSON.dump all_docs, f }
 end
 
@@ -35,8 +36,6 @@ def extract_docs path
   docs
 end
 
-StackRx = /(?<=\[)[^\]]+(?=\])/
-
 def strpack s
   s.bytes.zip(0..).sum { |b, e| b * 128 ** e }
 end
@@ -46,6 +45,8 @@ def parse_stack s
 end
 
 def parse_doc doc
+  StackRx = /(?<=\[)[^\]]+(?=\])/ # match [.+], but don't capture the brackets
+
   # strip comment character and any implementation details
   doc.gsub!(/; */, '').gsub!(/^!.+\n/, '')
 

data/lib/spitewaste/parsers/spitewaste.rb

@@ -19,7 +19,7 @@ module Spitewaste
       @symbol_file = options['symbol_file']
 
       preprocess!
-      eliminate_dead_code!
+      eliminate_dead_code! unless options[:keep_dead_code]
     end
 
     def parse

data/lib/spitewaste/version.rb

@@ -1,3 +1,3 @@
 module Spitewaste
-  VERSION = '0.1.002'
+  VERSION = '0.1.003'
 end

data/spitewaste.gemspec

@@ -1,17 +1,22 @@
 require_relative 'lib/spitewaste/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = 'spitewaste'
-  spec.version       = Spitewaste::VERSION
-  spec.author        = 'Collided Scope (collidedscope)'
+Gem::Specification.new do |s|
+  s.name          = 'spitewaste'
+  s.version       = Spitewaste::VERSION
+  s.author        = 'Collided Scope (collidedscope)'
 
-  spec.summary       = 'Make programming in Whitespace even better.'
-  spec.description   = 'Spitewaste is a collection of tools that makes it almost too easy to write Whitespace.'
-  spec.homepage      = 'https://github.com/collidedscope/spitewaste'
-  spec.license       = 'WTFPL'
+  s.summary       = 'Make programming in Whitespace even better.'
+  s.description   = 'Spitewaste is a collection of tools that makes it almost too easy to read and write Whitespace programs.'
+  s.homepage      = 'https://github.com/collidedscope/spitewaste'
+  s.license       = 'WTFPL'
 
-  spec.files         = `git ls-files`.split.reject { |f| f[/^test/] }
-  spec.bindir        = 'bin'
-  spec.executables   = ['spw']
-  spec.require_paths = ['lib']
+  s.add_dependency 'rake', '~> 13.0.1'
+  s.add_dependency 'minitest', '~> 5.14.2'
+  s.add_dependency 'thor', '~> 1.0.1'
+  s.add_dependency 'oily_png', '~> 1.2.1'
+
+  s.files         = `git ls-files`.split.reject { |f| f[/^(test|demo)/] }
+  s.bindir        = 'bin'
+  s.executables   = ['spw']
+  s.require_paths = ['lib']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spitewaste
 version: !ruby/object:Gem::Version
-  version: 0.1.002
+  version: 0.1.003
 platform: ruby
 authors:
 - Collided Scope (collidedscope)
@@ -9,9 +9,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2020-12-13 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.1
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.14.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.14.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: Spitewaste is a collection of tools that makes it almost too easy to
-  write Whitespace.
+  read and write Whitespace programs.
 email:
 executables:
 - spw
@@ -24,10 +80,6 @@ files:
 - Rakefile
 - TUTORIAL.md
 - bin/spw
-- demo/factorial-nicespace.png
-- demo/factorial.asm
-- demo/factorial.png
-- demo/factorial.wsa
 - lib/spitewaste.rb
 - lib/spitewaste/assembler.rb
 - lib/spitewaste/cli.rb

data/demo/factorial.asm

@@ -1,47 +0,0 @@
-label 0
-push 6
-call 1
-onum
-exit
-label 1
-push 1
-swap
-call 4
-dup
-dup
-dup
-push 2
-sub
-jn 3
-pop
-push -9
-swap
-push 1
-sub
-store
-label 2
-mul
-push -9
-dup
-load
-push 1
-sub
-dup
-jz 3
-store
-jump 2
-label 3
-pop
-pop
-ret
-label 4
-copy 1
-push 1
-add
-swap
-copy 1
-copy 1
-sub
-jn 4
-pop
-ret

data/demo/factorial.wsa

@@ -1,5 +0,0 @@
-main: push 6 call factorial onum exit
-factorial: push 1 swap call range dup dup dup push 2 sub jn reduce_done_a pop push -9 swap push 1 sub store
-reduce_loop_a: mul push -9 dup load push 1 sub dup jz reduce_done_a store jump reduce_loop_a
-reduce_done_a: pop pop ret
-range: copy 1 push 1 add swap copy 1 copy 1 sub jn range pop ret