code-ruby 0.5.6 → 0.6.1

data/spec/code/parser_spec.rb

@@ -1,23 +1,29 @@
-require "spec_helper"
+# frozen_string_literal: true
 
-RSpec.describe "Code::Parser" do
-  subject { Code::Parser.parse(input) }
+require "spec_helper"
 
+RSpec.describe Code::Parser do
   [
-    ["", []],
-    ["  ", []],
-    ["\n", []],
-    ["nothing", [{ nothing: "nothing" }]],
-    ["  nothing  ", [{ nothing: "nothing" }]],
-    [
-      "nothing null nil",
-      [{ nothing: "nothing" }, { nothing: "null" }, { nothing: "nil" }]
-    ]
-  ].each do |input, output|
-    context input.inspect do
-      let(:input) { input }
+    "",
+    "  ",
+    "\n",
+    "# comment",
+    "/* comment",
+    "/* comment */",
+    "// comment",
+    "/* first comment */ # second comment",
+    "nothing",
+    "  nothing  ",
+    "nothing nothing nothing"
+  ].each do |input, _output|
+    it input.inspect do
+      Code::Parser.parse(input)
+    end
+  end
 
-      it { expect(subject).to eq(output) }
+  Dir["spec/fixtures/code/parser/**/*.code"].each do |filename|
+    it "parses #{filename}" do
+      Code::Parser.parse(File.read(filename))
     end
   end
 end

data/spec/code/type_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Code::Type do
+  describe "valid" do
+    ["1 + 2", "2 * 3.4"].each do |input|
+      it input do
+        expect { Code.evaluate(input) }.to_not raise_error
+      end
+    end
+  end
+
+  describe "invalid" do
+    ["1 - :a", "2 * true"].each do |input|
+      it input do
+        expect { Code.evaluate(input) }.to raise_error(Code::Error::TypeError)
+      end
+    end
+  end
+end

data/spec/code_spec.rb

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Code do
+  [
+    ["1 + 1", "2"],
+    ["a = 1", "1"],
+    ["a = 1 b = 2 c = a + b c", "3"],
+    ["a = 1 a += 1 a", "2"],
+    ["a = b = c = 1 a + b + c", "3"],
+    ["3.times {}", "3"],
+    ["a = 1 3.times { a += 1 } a", "4"],
+    ['user = {} user[:name] = "Dorian" user[:name]', ":Dorian"],
+    ['user = {} user.name = "Dorian" user.name', ":Dorian"],
+    [
+      "user = { name: :Dorian, age: 31 } user.delete_if(String) user.keys",
+      '["age"]'
+    ],
+    [
+      "(user = { name: :Dorian, age: 31 }).transform_values { user.name }.age",
+      ":Dorian"
+    ],
+    ["1 & 1", "1"],
+    ["true && false", "false"],
+    ["true && true", "true"],
+    ["1 | 2", "3"],
+    ["1 ^ 2", "3"],
+    %w[true true],
+    %w[false false],
+    ["[1, 2, 3].select { |n| n.even? }", "[2]"],
+    ["[1, 2, 3].select { |n| n.even? }.select { |n| n.odd? }", "[]"],
+    %w[{} {}],
+    ["{ a: 1, b: 2, c: 3 }", '{"a" => 1, "b" => 2, "c" => 3}'],
+    ['{ "first_name": "Dorian" }', '{"first_name" => "Dorian"}'],
+    ["a = 1 a", "1"],
+    ["a = 1 a += 1 a", "2"],
+    ["a = 1 a -= 1 a", "0"],
+    ["a = 1 a *= 2 a", "2"],
+    ["a = 1 a /= 2 a", "0.5"],
+    ["a = 10 a %= 2 a", "0"],
+    ["a = 1 a >>= 1 a", "0"],
+    ["a = 1 a <<= 1 a", "2"],
+    ["a = 1 a |= 2 a", "3"],
+    ["a = 1 a ^= 2 a", "3"],
+    ["a = false a ||= true a", "true"],
+    ["a = false a &&= true a", "false"],
+    ["1 == 1", "true"],
+    ["1 == 1 and 2 == 2", "true"],
+    ["1 > 2", "false"],
+    ["1 < 2", "true"],
+    ["1 <= 1", "true"],
+    ["1 >= 1", "true"],
+    ["(true false)", "false"],
+    ["if true 1", "1"],
+    ["unless false 1", "1"],
+    ["if false 1", "nothing"],
+    ["unless true 1", "nothing"],
+    ["if false 1 else 2", "2"],
+    ["if false 1 elsif true 2", "2"],
+    ["if false 1 elsif false 2", "nothing"],
+    ["if false 1 else if true 2", "2"],
+    ["if false 1 else if false 2", "nothing"],
+    ["if false 1 else unless false 2", "2"],
+    ["if false 1 else unless true 2", "nothing"],
+    ["[]", "[]"],
+    ["[1, 2, 3]", "[1, 2, 3]"],
+    ["[1, 2, 3].include?(2)", "true"],
+    ["[1, 2, 3].include?(4)", "false"],
+    ["[[true]]", "[[true]]"],
+    ["2 * 3", "6"],
+    ["2 * 3 + 2", "8"],
+    ["2 + 2 * 3", "8"],
+    ["2 / 4", "0.5"],
+    ["4 % 3", "1"],
+    %w[!false true],
+    %w[!!true true],
+    %w[!!1 true],
+    %w[+1 1],
+    %w[+1.0 1.0],
+    %w[+true true],
+    ["not true", "false"],
+    ["not not false", "false"],
+    %w[0 0],
+    %w[1.1 1.1],
+    %w[0x10 16],
+    %w[0o10 8],
+    %w[0b10 2],
+    %w[1e1 10],
+    %w[1.0e1 10.0],
+    %w[10e1.0 100.0],
+    ["true or false", "true"],
+    ["true and false", "false"],
+    ["random = 1 random", "1"],
+    ["true || false", "true"],
+    ["false || false", "false"],
+    ["2 ** 3", "8"],
+    ["2 ** 3 ** 2", "512"],
+    ["a rescue :oops", ":oops"],
+    ["[1, 2].map(&:to_string)", "[:1, :2]"],
+    %w['' ""],
+    %w["" ''],
+    %w[:hello :hello],
+    %w[:admin? :admin?],
+    %w[:update!.to_string :update!],
+    ["'Hello Dorian'", '"Hello Dorian"'],
+    ['"Hello Dorian"', '"Hello Dorian"'],
+    ["'Hello \\{name}'", ':Hello + " \\{name}"'],
+    ['"Hello \\{name}"', '"Hello \\{" + "name}"'],
+    ["'Hello {1}'", '"Hello 1"'],
+    ['"Hello {1}"', '"Hello 1"'],
+    %w["Hello".include?("H") true],
+    %w["Hello".downcase :hello],
+    ["true ? 1", "1"],
+    ["false ? 1", ""],
+    ["true ? 1 : 2", "1"],
+    ["false ? 1 : 2", "2"],
+    %w[-1 -1],
+    %w[--1 1],
+    %w[-1.0 -1.0],
+    %w[--1.0 1.0],
+    ["while false", "nothing"],
+    ["a = 0\nwhile a < 10 a += 1 end a", "10"],
+    ["until true", "nothing"],
+    ["a = 0\nuntil a > 10 a += 1 end a", "11"],
+    ["1 >> 1", "0"],
+    ["1 << 1", "2"],
+    ["[1, 2].map(&:to_string)", '["1", "2"]']
+  ].each do |input, expected|
+    it "#{input} == #{expected}" do
+      expect(Code.evaluate(input)).to eq(Code.evaluate(expected))
+    end
+  end
+
+  [["puts(true)", "true\n"], %w[print(false) false]].each do |input, expected|
+    it "#{input} prints #{expected}" do
+      io = StringIO.new
+      Code.evaluate(input, io:)
+      expect(io.string).to eq(expected)
+    end
+  end
+
+  it "converts nil" do
+    ruby = Code::Ruby.from_code(Code.evaluate("a", ruby: { a: nil }))
+
+    expect(ruby).to eq(nil)
+  end
+
+  it "works with downcase" do
+    expect(Code.evaluate("downcase", "{ downcase: 1 }")).to eq(
+      Code.evaluate("1")
+    )
+  end
+
+  it "works with nested objects" do
+    expect(
+      Code.evaluate("items.first.title", ruby: { items: [{ title: "Hello" }] })
+    ).to eq(Code.evaluate(":Hello"))
+  end
+
+  it "works with arrays" do
+    expect(
+      Code.evaluate(
+        "items.map { |item| item.title }",
+        ruby: {
+          items: [{ title: "Hello" }]
+        }
+      )
+    ).to eq(Code.evaluate("[:Hello]"))
+  end
+end

data/spec/spec_helper.rb

@@ -1,6 +1 @@
-require_relative "../lib/template-ruby"
-require "json"
-
-RSpec.configure do |c|
-  c.example_status_persistence_file_path = "tmp/examples.txt"
-end
+require_relative "../lib/code-ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.1
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -24,45 +24,33 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: language-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'A programming language, like Code.evaluate("1 + 1") # => 2'
 email: dorian@dorianmarie.fr
-executables: []
+executables:
+- code
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cherry.js"
-- ".editorconfig"
-- ".github/workflows/rspec.yml"
-- ".gitignore"
-- ".prettierrc"
 - ".rspec"
-- ".tool-versions"
-- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
 - README.md
-- TODO
 - bin/code
-- bin/format
-- bin/publish
-- bin/template
-- bin/test
 - code-ruby.gemspec
-- docs/class.code
-- docs/euler/1.template
-- docs/euler/2.template
-- docs/euler/3.template
-- docs/euler/4.template
-- docs/euler/5.template
-- docs/fibonnaci.template
-- docs/meetup.code
-- docs/precedence.template
-- docs/rain.code
-- docs/slack.code
-- docs/stripe.code
-- docs/twitter.code
-- language-ruby.gemspec
 - lib/code-ruby.rb
 - lib/code.rb
 - lib/code/error.rb
@@ -74,24 +62,21 @@ files:
 - lib/code/node/boolean.rb
 - lib/code/node/call.rb
 - lib/code/node/call_argument.rb
-- lib/code/node/chained_call.rb
 - lib/code/node/code.rb
 - lib/code/node/decimal.rb
-- lib/code/node/dictionnary.rb
-- lib/code/node/equal.rb
+- lib/code/node/dictionary.rb
 - lib/code/node/function.rb
 - lib/code/node/function_parameter.rb
 - lib/code/node/if.rb
-- lib/code/node/if_modifier.rb
+- lib/code/node/left_operation.rb
 - lib/code/node/list.rb
 - lib/code/node/negation.rb
 - lib/code/node/not.rb
 - lib/code/node/nothing.rb
 - lib/code/node/number.rb
-- lib/code/node/operation.rb
-- lib/code/node/power.rb
-- lib/code/node/rescue.rb
+- lib/code/node/right_operation.rb
 - lib/code/node/splat.rb
+- lib/code/node/square_bracket.rb
 - lib/code/node/statement.rb
 - lib/code/node/string.rb
 - lib/code/node/ternary.rb
@@ -100,10 +85,13 @@ files:
 - lib/code/object.rb
 - lib/code/object/argument.rb
 - lib/code/object/boolean.rb
+- lib/code/object/class.rb
+- lib/code/object/context.rb
 - lib/code/object/decimal.rb
-- lib/code/object/dictionnary.rb
+- lib/code/object/dictionary.rb
 - lib/code/object/function.rb
 - lib/code/object/global.rb
+- lib/code/object/identifier_list.rb
 - lib/code/object/integer.rb
 - lib/code/object/list.rb
 - lib/code/object/nothing.rb
@@ -121,15 +109,15 @@ files:
 - lib/code/parser/chained_call.rb
 - lib/code/parser/class.rb
 - lib/code/parser/code.rb
-- lib/code/parser/dictionnary.rb
+- lib/code/parser/dictionary.rb
 - lib/code/parser/equal.rb
 - lib/code/parser/equality.rb
-- lib/code/parser/equality_lower.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
@@ -137,14 +125,15 @@ files:
 - lib/code/parser/not_keyword.rb
 - lib/code/parser/nothing.rb
 - lib/code/parser/number.rb
-- lib/code/parser/operation.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
@@ -152,74 +141,35 @@ files:
 - lib/code/parser/while.rb
 - lib/code/parser/whitespace.rb
 - lib/code/ruby.rb
-- lib/language-ruby.rb
-- lib/language.rb
-- lib/language/atom.rb
-- lib/language/output.rb
-- lib/language/parser.rb
-- lib/language/parser/absent.rb
-- lib/language/parser/absent/present.rb
-- lib/language/parser/end_of_input.rb
-- lib/language/parser/interuption.rb
-- lib/language/parser/not_end_of_input.rb
-- lib/language/parser/str.rb
-- lib/language/parser/str/not_found.rb
-- lib/template-ruby.rb
-- lib/template.rb
-- lib/template/node.rb
-- lib/template/node/code_part.rb
-- lib/template/node/part.rb
-- lib/template/node/template.rb
-- lib/template/node/text_part.rb
-- lib/template/parser.rb
-- lib/template/parser/template.rb
-- lib/template/version.rb
-- spec/code/addition_spec.rb
-- spec/code/and_operator_spec.rb
-- spec/code/bitwise_and_spec.rb
-- spec/code/bitwise_or_spec.rb
-- spec/code/boolean_spec.rb
-- spec/code/call_spec.rb
-- spec/code/chained_call_spec.rb
-- spec/code/code_spec.rb
-- spec/code/dictionnary_spec.rb
-- spec/code/equal_spec.rb
-- spec/code/equality_spec.rb
-- spec/code/function_spec.rb
-- spec/code/greater_spec.rb
-- spec/code/group_spec.rb
-- spec/code/if_modifier_spec.rb
-- spec/code/if_spec.rb
-- spec/code/list_spec.rb
-- spec/code/multiplication_spec.rb
-- spec/code/negation_spec.rb
-- spec/code/not_keyword_spec.rb
-- spec/code/nothing_spec.rb
-- spec/code/number_spec.rb
-- spec/code/or_keyword_spec.rb
-- spec/code/or_operator_spec.rb
+- lib/code/type.rb
+- lib/code/type/hash.rb
+- lib/code/type/maybe.rb
+- lib/code/type/or.rb
+- lib/code/type/repeat.rb
+- lib/code/type/sig.rb
+- lib/code/version.rb
+- spec/code/node/call_spec.rb
+- spec/code/object/boolean_spec.rb
+- spec/code/object/decimal_spec.rb
+- spec/code/object/dictionary_spec.rb
+- spec/code/object/function_spec.rb
+- spec/code/object/integer_spec.rb
+- spec/code/object/nothing_spec.rb
+- spec/code/object/range_spec.rb
 - spec/code/parser/boolean_spec.rb
-- spec/code/parser/call_spec.rb
 - spec/code/parser/chained_call.rb
-- spec/code/parser/dictionnary_spec.rb
+- spec/code/parser/dictionary_spec.rb
 - spec/code/parser/function_spec.rb
 - spec/code/parser/group_spec.rb
+- spec/code/parser/if_modifier_spec.rb
 - spec/code/parser/list_spec.rb
 - spec/code/parser/number_spec.rb
 - spec/code/parser/string_spec.rb
 - spec/code/parser_spec.rb
-- spec/code/power_spec.rb
-- spec/code/range_spec.rb
-- spec/code/rescue_spec.rb
-- spec/code/shift_spec.rb
-- spec/code/splat_spec.rb
-- spec/code/string_spec.rb
-- spec/code/ternary_spec.rb
-- spec/code/unary_minus_spec.rb
-- spec/code/while_spec.rb
+- spec/code/type_spec.rb
+- spec/code_spec.rb
 - spec/spec_helper.rb
-- template-ruby.gemspec
-homepage: https://github.com/dorianmariefr/template-ruby
+homepage: https://github.com/dorianmariefr/code-ruby
 licenses:
 - MIT
 metadata: {}
@@ -238,52 +188,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: A programming language
 test_files:
-- spec/code/addition_spec.rb
-- spec/code/and_operator_spec.rb
-- spec/code/bitwise_and_spec.rb
-- spec/code/bitwise_or_spec.rb
-- spec/code/boolean_spec.rb
-- spec/code/call_spec.rb
-- spec/code/chained_call_spec.rb
-- spec/code/code_spec.rb
-- spec/code/dictionnary_spec.rb
-- spec/code/equal_spec.rb
-- spec/code/equality_spec.rb
-- spec/code/function_spec.rb
-- spec/code/greater_spec.rb
-- spec/code/group_spec.rb
-- spec/code/if_modifier_spec.rb
-- spec/code/if_spec.rb
-- spec/code/list_spec.rb
-- spec/code/multiplication_spec.rb
-- spec/code/negation_spec.rb
-- spec/code/not_keyword_spec.rb
-- spec/code/nothing_spec.rb
-- spec/code/number_spec.rb
-- spec/code/or_keyword_spec.rb
-- spec/code/or_operator_spec.rb
+- spec/code/node/call_spec.rb
+- spec/code/object/boolean_spec.rb
+- spec/code/object/decimal_spec.rb
+- spec/code/object/dictionary_spec.rb
+- spec/code/object/function_spec.rb
+- spec/code/object/integer_spec.rb
+- spec/code/object/nothing_spec.rb
+- spec/code/object/range_spec.rb
 - spec/code/parser/boolean_spec.rb
-- spec/code/parser/call_spec.rb
 - spec/code/parser/chained_call.rb
-- spec/code/parser/dictionnary_spec.rb
+- spec/code/parser/dictionary_spec.rb
 - spec/code/parser/function_spec.rb
 - spec/code/parser/group_spec.rb
+- spec/code/parser/if_modifier_spec.rb
 - spec/code/parser/list_spec.rb
 - spec/code/parser/number_spec.rb
 - spec/code/parser/string_spec.rb
 - spec/code/parser_spec.rb
-- spec/code/power_spec.rb
-- spec/code/range_spec.rb
-- spec/code/rescue_spec.rb
-- spec/code/shift_spec.rb
-- spec/code/splat_spec.rb
-- spec/code/string_spec.rb
-- spec/code/ternary_spec.rb
-- spec/code/unary_minus_spec.rb
-- spec/code/while_spec.rb
+- spec/code/type_spec.rb
+- spec/code_spec.rb
 - spec/spec_helper.rb

data/.cherry.js

@@ -1,21 +0,0 @@
-module.exports = {
-  project_name: 'dorianmariefr/template-ruby',
-  metrics: [
-    {
-      name: 'todo',
-      pattern: /TODO:/i,
-    },
-    {
-      name: 'fixme',
-      pattern: /FIXME:/i,
-    },
-    {
-      name: 'rubocop',
-      pattern: /rubocop:disable/,
-    },
-    {
-      name: 'eslint',
-      pattern: /eslint-disable/,
-    },
-  ],
-}

data/.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true

data/.github/workflows/rspec.yml

@@ -1,14 +0,0 @@
-name: RSpec
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: RSpec
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-ruby@v1
-      - run: bundle install
-      - run: bundle exec rspec

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-tmp/

data/.prettierrc

@@ -1,3 +0,0 @@
-{
-  "rubyPlugins": "plugin/trailing_comma"
-}

data/.tool-versions

@@ -1 +0,0 @@
-ruby 3.1.3

data/CHANGELOG.md

@@ -1,55 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## 0.4.0 / 2022-10-21
-
-- Rewrite of how functions are called internally (no more `public_send`)
-- Call ruby functions from template/code
-
-## 0.3.1 / 2022-10-13
-
-- Fix Zeitwerk auto-loading issue
-
-## 0.3.0 / 2022-10-10
-
-- `bin/template` accepts `--timeout` (or `-t`) parameter
-- Adds `bin/code` with same options as `bin/template`
-- Prevent loose syntax like `{ a: }`, `[1,,,]` and `()`
-- Change precedence of defined? (to allow `defined?(name) ? name : nothing`)
-- Updates parsers to allow `while false end == nothing`
-- String interpolations like `"1 + 1 = {1 + 1}"`
-- `context(:name)` to get a function without calling it for instance
-- `.to_string` on all objects
-- `1 + "a"` and `"a" + 1.0` for instance now convert to strings
-- `Dictionnary#each` e.g. `{ a: 1 }.each { |k, v| print(k) }`
-- Fix context duplication issue that was preventing implementation of recursive
-  functions like Fibonacci
-
-## 0.2.4 / 2022-08-02
-
-- Add method `String#*`, e.g. `{"Dorian " \* 2}" -> "Dorian Dorian "
-- Add executable to gem, e.g. `template --help`
-
-## 0.2.3 / 2022-08-31
-
-- Add default timeout for code and template parsing and evaluation
-
-## 0.2.2 / 2022-08-31
-
-- Fix parsing error when the template is empty, e.g. ""
-
-## 0.2.1 / 2022-08-31
-
-- Fix parsing error on empty code like `Hello {`
-
-## 0.2.0 / 2022-08-30
-
-- Programming language capable of solving the first 5 Project Euler problems
-
-## 0.1.0 / 2022-07-28
-
-- Initial version with interpolation