kaiser-ruby 0.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed13667ff5f7efa6ac48fda708e248bf329466e999604dc3896eccc5b3b47cbe
-  data.tar.gz: be140e748235e62bab3e24d86a55aaea75b2a33521220355e9e9274dfdd58324
+  metadata.gz: d86f7b4d4eeb3c6c63aee4afd51fafb2e1676fe6d743a8df48a10a77b7e761e8
+  data.tar.gz: 1090782c7e4bb4684ffbc3162f4d5ae6529c0e4cfd3d29d227938f1a930d8519
 SHA512:
-  metadata.gz: c16d9fb8793f6f81cd7bdddad78c14efc749a7d9ac47b9d25d6565c78443372dbbd57a77ac65de9531d168101a40f6825ec75e8c30d802df936799c3827468ec
-  data.tar.gz: 5a3fd840db588ca27ee1ceed35a651fa9ff019ea40cbf67f1ea6258a6808016b232bf2679a0ee683af50ae71268eef7b37f00cd58bd37ef078e95bb3f4c57447
+  metadata.gz: 9cf3a4423bc2d0da323ac5dcf575cdacf373eac7d3aaccee48c23781a85589342941a225a909b53f7e342baa611e0fe8ad8997c37386f44ffc306bff96160839
+  data.tar.gz: 100adddde94add35ad05b3a2d58d8a99993bc88b55f8d71a452f0356468d8f4a1be669a6bb3531d0ca596d8230b73098ee447b28b65d86bfefe40c245fb26d22

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.7.1
+
+- [x] Strips all lines while parsing, so you can indent the .rock file however you want
+- [x] Adds line numbers to all parse/transform errors
+- [x] More examples
+- [x] Fix CLI (@jzaia18)
+
 # 0.7
 
 Language Implementation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kaiser-ruby (0.7)
+    kaiser-ruby (0.7.1)
       hashie
       thor (~> 0.20)
 

data/README.md

@@ -63,7 +63,7 @@ end
 
 ```
 
-You can also use the `--save=FILE` option to write the resulting transpiled code as a file instead of outputting it. 
+You can also use the `--save=FILE` option to write the resulting transpiled code as a file instead of outputting it.
 
 ```
 $ kaiser-ruby transpile ./examples/simple.rock --save=simple.rb
@@ -74,7 +74,7 @@ Saved output in `simple.rb`
 The saved output will have a few additional lines at the start that include the language changes necessary for Rockstar to work correctly. You need the gem installed to run this file:
 
 ```
-$ ruby simple.rb 
+$ ruby simple.rb
 15.0
 
 ```

data/TODO.md

@@ -6,7 +6,6 @@
 
 - [ ] Should be able to run the [Cellular Rockomata](https://github.com/Rifhutch/cellular-rocktomata)
 - [ ] Math module https://gist.github.com/wrenoud/6be6f7509c88a3d8f9867ae782fb768f
-- [ ] Primality checker https://www.reddit.com/r/RockstarDevs/comments/92i6sm/primality_checker_in_rockstar/
 
 ## Other stuff
 

data/lib/kaiser_ruby/cli.rb

@@ -1,9 +1,10 @@
 require 'thor'
+require_relative 'version'
 
 module KaiserRuby
   class CLI < Thor
     package_name "Kaiser-Ruby v#{KaiserRuby::VERSION}"
-    
+
     desc "transpile FILE", "transpile a .rock FILE and output the result"
     option 'show-source'.to_sym, type: :boolean, desc: "prints out the source file along with the transpiled output"
     option :save, desc: "saves the transpiled output in SAVE"
@@ -21,7 +22,7 @@ module KaiserRuby
         out.write <<~REQ
           require 'kaiser_ruby/refinements'
           using KaiserRuby::Refinements
-          
+
         REQ
         out.write output
         out.close

data/lib/kaiser_ruby/parser.rb

@@ -94,7 +94,9 @@ module KaiserRuby
     end
 
     def parse_line(line)
-      if line.strip.empty?
+      line = line.strip
+
+      if line.empty?
         if @nesting > 0
           @nesting -= 1
           @nesting_start_line = nil
@@ -158,7 +160,7 @@ module KaiserRuby
         end
       end
 
-      raise KaiserRuby::RockstarSyntaxError, "couldn't parse line: #{line}"
+      raise KaiserRuby::RockstarSyntaxError, "couldn't parse line: #{line}:#{@lnum+1}"
     end
 
     # statements
@@ -276,16 +278,16 @@ module KaiserRuby
       words = string.split /\s/
 
       if matches_first?(words, NIL_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword" if words.count > 1
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
         { type: 'nil' }
       elsif matches_first?(words, NULL_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword" if words.count > 1
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
         { type: 'null' }
       elsif matches_first?(words, TRUE_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword" if words.count > 1
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
         { type: 'true' }
       elsif matches_first?(words, FALSE_TYPE)
-        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword" if words.count > 1
+        raise KaiserRuby::RockstarSyntaxError, "extra words are not allowed after literal type keyword: #{string}:#{@lnum+1}" if words.count > 1
         { type: 'false' }
       elsif string.strip.start_with?('"') && string.strip.end_with?('"')
         parse_literal_string(string)
@@ -296,7 +298,7 @@ module KaiserRuby
 
     def parse_type_literal(string)
       words = string.split /\s/
-      raise SyntaxError, "too many words in poetic type literal: #{string}" if words.size > 1
+      raise SyntaxError, "too many words in poetic type literal: #{string}:#{@lnum+1}" if words.size > 1
 
       if matches_first?(words, NIL_TYPE)
         { type: 'nil' }
@@ -307,7 +309,7 @@ module KaiserRuby
       elsif matches_first?(words, FALSE_TYPE)
         { type: 'false' }
       else
-        raise SyntaxError, "unknown poetic type literal: #{string}"
+        raise SyntaxError, "unknown poetic type literal: #{string}:#{@lnum+1}"
       end
     end
 
@@ -562,7 +564,7 @@ module KaiserRuby
       copied = words.dup
       copied.shift
       copied.each do |w|
-        raise SyntaxError, "invalid common variable name: #{string}" if w =~ /[[:upper:]]/
+        raise SyntaxError, "invalid common variable name: #{string}:#{@lnum+1}" if w =~ /[[:upper:]]/
       end
 
       words = words.map { |e| e.chars.select { |c| c =~ /[[:alpha:]]/ }.join }
@@ -575,7 +577,7 @@ module KaiserRuby
       copied = words.dup
       copied.shift
       copied.each do |w|
-        raise SyntaxError, "invalid proper variable name: #{string}" unless w =~ /\A[[:upper:]]/
+        raise SyntaxError, "invalid proper variable name: #{string}:#{@lnum+1}" unless w =~ /\A[[:upper:]]/
       end
 
       words = words.map { |e| e.chars.select { |c| c =~ /[[:alpha:]]/ }.join }

data/lib/kaiser_ruby/transformer.rb

@@ -89,9 +89,9 @@ module KaiserRuby
         else
           @local_variables << varname
         end
-      else  
-        unless @local_variables.include?(varname) 
-          varname = @method_names.include?(varname) ? varname : "@#{varname}" 
+      else
+        unless @local_variables.include?(varname)
+          varname = @method_names.include?(varname) ? varname : "@#{varname}"
         end
       end
 
@@ -237,7 +237,7 @@ module KaiserRuby
     end
 
     def additional_argument_transformation(argument)
-      # testing function existence 
+      # testing function existence
       arg = @method_names.include?(argument) ? "defined?(#{argument})" : argument
 
       # single variable without any operator needs to return a refined boolean

data/lib/kaiser_ruby/version.rb

@@ -1,3 +1,3 @@
 module KaiserRuby
-  VERSION = "0.7"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaiser-ruby
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.1
 platform: ruby
 authors:
 - Marcin Ruszkiewicz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler