code-ruby 2.0.1 → 3.0.0

data/lib/code-ruby.rb

@@ -8,7 +8,6 @@ require "date"
 require "did_you_mean"
 require "digest"
 require "json"
-require "language-ruby"
 require "mail"
 require "net/http"
 require "nokogiri"

data/spec/code/node/call_spec.rb

@@ -1,3 +1,13 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+
+RSpec.describe "parser call" do
+  [
+    "f(end: 2)"
+  ].each do |input|
+    it "parses #{input}" do
+      Code::Parser.parse(input)
+    end
+  end
+end

data/spec/code/parser/boolean_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::Boolean do
+RSpec.describe "parser boolean" do
   [%w[true !false], %w[false !true]].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(Code.evaluate(input)).to eq(Code.evaluate(expected))

data/spec/code/parser/chained_call_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::ChainedCall do
+RSpec.describe "parser chained call" do
   [
     "a.b",
     "user.first_name",

data/spec/code/parser/dictionary_spec.rb

@@ -2,13 +2,14 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::Dictionary do
+RSpec.describe "parser dictionary" do
   [
     "{}",
     "{ }",
     "{/* comment */}",
     "{ a: 1, b: 2, c: 3 }",
-    '{ "first_name": "Dorian" }'
+    '{ "first_name": "Dorian" }',
+    "{ end: 2 }"
   ].each do |input|
     it "parses #{input}" do
       Code::Parser.parse(input)

data/spec/code/parser/function_spec.rb

@@ -2,11 +2,12 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::Function do
+RSpec.describe "parser function" do
   [
     "() => {}",
     "(a, b) => { add(a, b) }",
-    "(a:, b:) => { add(a, b) }"
+    "(a:, b:) => { add(a, b) }",
+    "(end:) => { nothing }"
   ].each do |input|
     it "parses #{input}" do
       Code::Parser.parse(input)

data/spec/code/parser/group_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::Group do
+RSpec.describe "parser group" do
   ["(true (nothing))"].each do |input|
     it "parses #{input}" do
       Code::Parser.parse(input)

data/spec/code/parser/if_modifier_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::IfModifier do
+RSpec.describe "parser if modifier" do
   [
     ["1 if true", "1"],
     ["1 if false", "nothing"],

data/spec/code/parser/list_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::List do
+RSpec.describe "parser list" do
   [
     "[]",
     "[ ]",

data/spec/code/parser/number_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::Number do
+RSpec.describe "parser number" do
   %w[0 1 1.1 123.123 1_000.12_244 0xf0 0o70 0b10].each do |input|
     it "parses #{input}" do
       Code::Parser.parse(input)

data/spec/code/parser/string_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-RSpec.describe Code::Parser::String do
+RSpec.describe "parser string" do
   [
     "''",
     '""',

data/spec/code_spec.rb

@@ -173,6 +173,7 @@ RSpec.describe Code do
       "(user = { name: :Dorian, age: 31 }).transform_values { user.name }.age",
       ":Dorian"
     ],
+    ["{ end: 2 }.keys.first", ":end"],
     %w[!!1 true],
     %w[!!true true],
     %w[!false true],
@@ -343,6 +344,7 @@ RSpec.describe Code do
     ["a = 1 a += 1 a", "2"],
     ["a = 1 a -= 1 a", "0"],
     ["a = 3 a -= 1 if false a", "3"],
+    ["a = 1 a = - 1 if false a", "1"],
     ["a = 3\n(a -= 1) if false\na", "3"],
     ["a = 1 a /= 2 a", "0.5"],
     ["a = 1 a <<= 1 a", "2"],
@@ -484,7 +486,6 @@ RSpec.describe Code do
     ["", ""]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
-      puts input
       formatted = format_input(input)
 
       output = StringIO.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Dorian Marié
@@ -289,46 +289,6 @@ files:
 - lib/code/object/time.rb
 - lib/code/object/url.rb
 - lib/code/parser.rb
-- lib/code/parser/addition.rb
-- lib/code/parser/and_operator.rb
-- lib/code/parser/bitwise_and.rb
-- lib/code/parser/bitwise_or.rb
-- lib/code/parser/boolean.rb
-- lib/code/parser/call.rb
-- lib/code/parser/chained_call.rb
-- lib/code/parser/class.rb
-- lib/code/parser/code.rb
-- lib/code/parser/dictionary.rb
-- lib/code/parser/equal.rb
-- lib/code/parser/equality.rb
-- lib/code/parser/function.rb
-- lib/code/parser/greater.rb
-- lib/code/parser/group.rb
-- lib/code/parser/if.rb
-- lib/code/parser/if_modifier.rb
-- lib/code/parser/left_operation.rb
-- lib/code/parser/list.rb
-- lib/code/parser/multiplication.rb
-- lib/code/parser/name.rb
-- lib/code/parser/negation.rb
-- lib/code/parser/not_keyword.rb
-- lib/code/parser/nothing.rb
-- lib/code/parser/number.rb
-- lib/code/parser/or_keyword.rb
-- lib/code/parser/or_operator.rb
-- lib/code/parser/power.rb
-- lib/code/parser/range.rb
-- lib/code/parser/rescue.rb
-- lib/code/parser/right_operation.rb
-- lib/code/parser/shift.rb
-- lib/code/parser/splat.rb
-- lib/code/parser/square_bracket.rb
-- lib/code/parser/statement.rb
-- lib/code/parser/string.rb
-- lib/code/parser/ternary.rb
-- lib/code/parser/unary_minus.rb
-- lib/code/parser/while.rb
-- lib/code/parser/whitespace.rb
 - lib/code/type.rb
 - lib/code/type/hash.rb
 - lib/code/type/maybe.rb

data/lib/code/parser/addition.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class Addition < LeftOperation
-      def statement
-        Multiplication
-      end
-
-      def plus
-        str("+")
-      end
-
-      def minus
-        str("-")
-      end
-
-      def operator
-        plus | minus
-      end
-    end
-  end
-end

data/lib/code/parser/and_operator.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class AndOperator < LeftOperation
-      def statement
-        Equality
-      end
-
-      def ampersand
-        str("&")
-      end
-
-      def operator
-        ampersand << ampersand
-      end
-    end
-  end
-end

data/lib/code/parser/bitwise_and.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class BitwiseAnd < LeftOperation
-      def statement
-        Shift
-      end
-
-      def whitespace?
-        whitespace
-      end
-
-      def ampersand
-        str("&")
-      end
-
-      def operator
-        ampersand
-      end
-    end
-  end
-end

data/lib/code/parser/bitwise_or.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class BitwiseOr < LeftOperation
-      def statement
-        BitwiseAnd
-      end
-
-      def pipe
-        str("|")
-      end
-
-      def caret
-        str("^")
-      end
-
-      def operator
-        pipe | caret
-      end
-    end
-  end
-end

data/lib/code/parser/boolean.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class Boolean < Language
-      def separator
-        Name.new.separator
-      end
-
-      def true_keyword
-        str("true") << separator.present
-      end
-
-      def false_keyword
-        str("false") << separator.present
-      end
-
-      def root
-        (true_keyword | false_keyword).aka(:boolean) | Nothing
-      end
-    end
-  end
-end

data/lib/code/parser/call.rb

@@ -1,161 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class Call < Language
-      def name
-        Name
-      end
-
-      def whitespace
-        Whitespace
-      end
-
-      def whiltespace_without_newline?
-        Whitespace.new.without_newline.maybe
-      end
-
-      def whitespace?
-        whitespace.maybe
-      end
-
-      def code
-        Code
-      end
-
-      def code_present
-        Code.new.present
-      end
-
-      def colon
-        str(":")
-      end
-
-      def comma
-        str(",")
-      end
-
-      def pipe
-        str("|")
-      end
-
-      def equal
-        str("=")
-      end
-
-      def opening_curly_bracket
-        str("{")
-      end
-
-      def closing_curly_bracket
-        str("}")
-      end
-
-      def opening_parenthesis
-        str("(")
-      end
-
-      def closing_parenthesis
-        str(")")
-      end
-
-      def separator
-        Name.new.separator
-      end
-
-      def do_keyword
-        str("do") << separator.present
-      end
-
-      def begin_keyword
-        str("do") << separator.present
-      end
-
-      def end_keyword
-        str("end") << separator.present
-      end
-
-      def asterisk
-        str("*")
-      end
-
-      def ampersand
-        str("&")
-      end
-
-      def spread_operator
-        str("...") | str("..") | str(".")
-      end
-
-      def keyword_argument
-        name.aka(:name) << whitespace? << colon << code.aka(:value)
-      end
-
-      def regular_argument
-        code_present.aka(:value)
-      end
-
-      def argument
-        keyword_argument | regular_argument
-      end
-
-      def arguments
-        opening_parenthesis.ignore << whitespace? <<
-          (
-            whitespace? << argument <<
-              (whitespace? << comma << whitespace?).maybe
-          ).repeat << whitespace? << closing_parenthesis.ignore.maybe
-      end
-
-      def prefix
-        (asterisk << asterisk).aka(:keyword_splat) |
-          asterisk.aka(:regular_splat) | ampersand.aka(:block) |
-          spread_operator.aka(:spread)
-      end
-
-      def keyword_parameter
-        name.aka(:name) << whitespace? << colon.aka(:keyword) <<
-          code_present.aka(:default).maybe
-      end
-
-      def regular_parameter
-        ((prefix.maybe << name.aka(:name)) | prefix) << whitespace? <<
-          (equal << whitespace? << code_present.aka(:default)).maybe
-      end
-
-      def parameter
-        keyword_parameter | regular_parameter
-      end
-
-      def parameters
-        pipe.ignore << whitespace? <<
-          (
-            whitespace? << parameter <<
-              (whitespace? << comma << whitespace?).maybe
-          ).repeat << (whitespace? << pipe.ignore).maybe
-      end
-
-      def block
-        (
-          (do_keyword | begin_keyword).ignore << whitespace <<
-            parameters.aka(:parameters).maybe << whitespace? <<
-            code.aka(:body) << (whitespace? << end_keyword).maybe.ignore
-        ) |
-          (
-            opening_curly_bracket.ignore << whitespace? <<
-              parameters.aka(:parameters).maybe << whitespace? <<
-              code.aka(:body) <<
-              (whitespace? << closing_curly_bracket).maybe.ignore
-          )
-      end
-
-      def root
-        (
-          name.aka(:name) <<
-            (whiltespace_without_newline? << arguments.aka(:arguments)).maybe <<
-            (whiltespace_without_newline? << block.aka(:block)).maybe
-        ).aka(:call)
-      end
-    end
-  end
-end

data/lib/code/parser/chained_call.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class ChainedCall < LeftOperation
-      def statement
-        SquareBracket
-      end
-
-      def dot
-        str(".")
-      end
-
-      def ampersand
-        str("&")
-      end
-
-      def colon
-        str(":")
-      end
-
-      def right_statement
-        ChainedCall
-      end
-
-      def operator
-        dot | (colon << colon) | (ampersand << dot)
-      end
-    end
-  end
-end

data/lib/code/parser/class.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class Class < Language
-      def statement
-        While
-      end
-
-      def root
-        statement
-      end
-    end
-  end
-end

data/lib/code/parser/code.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class Code < Language
-      def whitespace
-        Whitespace
-      end
-
-      def whitespace?
-        whitespace.maybe
-      end
-
-      def statement
-        Statement
-      end
-
-      def present
-        (whitespace? << statement << whitespace?).repeat(1)
-      end
-
-      def root
-        present | whitespace?
-      end
-    end
-  end
-end

data/lib/code/parser/dictionary.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-class Code
-  class Parser
-    class Dictionary < Language
-      def code_present
-        Code.new.present
-      end
-
-      def statement
-        Statement
-      end
-
-      def name
-        Name
-      end
-
-      def whitespace
-        Whitespace
-      end
-
-      def whitespace?
-        whitespace.maybe
-      end
-
-      def opening_curly_bracket
-        str("{")
-      end
-
-      def closing_curly_bracket
-        str("}")
-      end
-
-      def comma
-        str(",")
-      end
-
-      def colon
-        str(":")
-      end
-
-      def equal
-        str("=")
-      end
-
-      def greater
-        str(">")
-      end
-
-      def key_value
-        (name.aka(:name) << colon << code_present.aka(:code).maybe).aka(
-          :name_code
-        ) |
-          (
-            statement.aka(:statement) << colon << code_present.aka(:code).maybe
-          ).aka(:statement_code) |
-          (
-            statement.aka(:statement) << whitespace? << equal << greater <<
-              code_present.aka(:code).maybe
-          ).aka(:statement_code) | code_present.aka(:code)
-      end
-
-      def root
-        (
-          opening_curly_bracket.ignore << whitespace? <<
-            (whitespace? << key_value << (whitespace? << comma).maybe).repeat <<
-            (whitespace? << closing_curly_bracket.ignore).maybe
-        ).aka(:dictionnary) | List
-      end
-    end
-  end
-end