code-ruby 0.5.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ec67f37dc432338ef23418046fd1b4672268351bbce19bc737793df2fef16c8
-  data.tar.gz: 1e92c9e186f0463109589f843862c01633af3cbcc6d12a6f916b7b40ddd641ed
+  metadata.gz: 1d1e6240535fbaa53a8402bb09fca25f382435c77b631953da7650279c1779c4
+  data.tar.gz: 31ca274073a554129651ad5f6f398ec421bdf34ce20d0953f360b801bb4ba1f4
 SHA512:
-  metadata.gz: 218135cc2e96e8d85609c3efe047d7aa716a3a87380dd60608bb4d2d107b44c86852362dcadeff7b18e35800dbbe172761d457d3bf039c2dae36fb8b3fa1358d
-  data.tar.gz: c44d215dcb56eb2f2357139e16c3cca8fe4e4ecff825dc62afec8625695c6f2f0634c428605e57461f73debd58c6d72a6a4f2fcb0a680cf76593df4edbd9d5a0
+  metadata.gz: a81a91547923b0bcdca0b971fc0a18a684c439a4bf4821fd4b981afa06d4dbcb7baaf00b4e0e04513a2bc4abbd965b538ab92a7f4cf5739a42d1ffd306c72108
+  data.tar.gz: b4135cc2b58e02bde82fe6fb41de533f5c37e0c8ca13bd2507e8c559fb2ebd71b796ab36059c5db0f0a51ca73091c75581136c38a5558e89e0f3ef8341f7a436

data/Gemfile

@@ -1,8 +1,6 @@
 source "https://rubygems.org"
 
-gemspec name: "template-ruby"
-gemspec name: "code-ruby"
+gemspec
 
 gem "rspec"
-gem "syntax_tree", github: "dorianmariefr/syntax_tree"
 gem "ruby-prof"

data/Gemfile.lock

@@ -1,49 +1,39 @@
-GIT
-  remote: https://github.com/dorianmariefr/syntax_tree.git
-  revision: f7c9dc36a3d60c90a8d2411f123913b37319dc11
-  specs:
-    syntax_tree (5.0.1)
-      prettier_print (>= 1.1.0)
-
 PATH
   remote: .
   specs:
-    code-ruby (0.5.6)
-      zeitwerk (~> 2)
-    template-ruby (0.5.6)
+    code-ruby (0.6.0)
+      language-ruby (~> 0)
       zeitwerk (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.5.0)
-    prettier_print (1.1.0)
+    language-ruby (0.6.0)
+      zeitwerk (~> 2)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    ruby-prof (1.4.3)
-    zeitwerk (2.6.6)
+    rspec-support (3.12.1)
+    ruby-prof (1.6.3)
+    zeitwerk (2.6.12)
 
 PLATFORMS
-  arm64-darwin-21
   arm64-darwin-22
 
 DEPENDENCIES
   code-ruby!
   rspec
   ruby-prof
-  syntax_tree!
-  template-ruby!
 
 BUNDLED WITH
-   2.3.18
+   2.4.22

data/README.md

@@ -1,103 +1,3 @@
-# Template
+# code-ruby
 
-[![RSpec](https://github.com/dorianmariefr/template-ruby/actions/workflows/rspec.yml/badge.svg)](https://github.com/dorianmariefr/template-ruby/actions/workflows/rspec.yml)
-
-See [templatelang.com](https://templatelang.com) for the full documentation and
-live code editing.
-
-## The programming language
-
-Hi, I'm [Dorian Marié](https://dorianmarie.fr), I created Template to let users of my websites provide templates to customize their experience.
-
-Template is meant to be:
-
-- **Simple**: `Hello` and `Hello {name}`
-- **Safe**: Can be provided user input
-- **Powerful**: Functions, object-oriented, built-in methods
-
-Template is currently written in Ruby and embeddable as a Ruby gem.
-
-## Install
-
-### As a command line tool:
-
-```bash
-$ gem install template-ruby
-$ template --input "Hello {name}" --context '{ name: "Dorian" }'
-Hello Dorian
-$ template --input "1 + 2 = {1 + 2}"
-1 + 2 = 3
-```
-
-### As a Ruby gem:
-
-In a `Gemfile`:
-
-```ruby
-gem "template-ruby"
-```
-
-Then `$ bundle install`
-
-Then you can use Template like:
-
-```ruby
-Template.render("Hello {name}", '{ name: "Dorian" }')
-# => "Hello Dorian"
-Template.render("1 + 2 = {1 + 2}")
-# => "1 + 2 = 3"
-Template.render(input, context, io: StringIO.new, timeout: 10)
-```
-
-The context is a sub-language called Code, you can use it like:
-
-```ruby
-Code.evaluate("1 + 2") # => 3
-```
-
-## Future work
-
-- Extend standard library
-- Global methods from Ruby, e.g. `{markdown "**bold**"}`
-- Object methods from Ruby, e.g. `{"**bold**".markdown}`
-- Classes, e.g. `{class User end}`
-- Write JavaScript version
-- Write Crystal version
-
-## Contributing
-
-Feel free to open [issues](https://github.com/dorianmariefr/template-ruby/issues),
-and [pull requests](https://github.com/dorianmariefr/template-ruby/pulls).
-
-To develop locally:
-
-```text
-$ git clone https://github.com/dorianmariefr/template-ruby
-$ cd template-ruby
-$ bundle
-$ rspec
-$ bin/template -i docs/...
-```
-
-## Credits
-
-Thanks to [thoughtbot](https://thoughtbot.com) who let me work on this programming
-language as a Friday project.
-
-Thanks to [Kaspar Schiess](https://github.com/kschiess) who made
-[Parslet](https://kschiess.github.io/parslet/), the gem that helped me write the parser.
-
-Inspiration from [Ruby](https://www.ruby-lang.org/en/) and
-[Liquid](https://shopify.github.io/liquid/).
-
-## License
-
-MIT
-
-Copyright 2022 Dorian Marié <dorian@dorianmarie.fr>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+A programming language, like `Code.evaluate("1 + 1") # => 2`

data/bin/code

@@ -1,20 +1,29 @@
 #!/usr/bin/env ruby
 
 require "optparse"
-require_relative "../lib/template-ruby"
+require_relative "../lib/code-ruby"
 
-options = { timeout: 0, profile: false }
+options = { timeout: 0, profile: false, profiler: "text" }
 
 OptionParser
   .new do |opts|
-    opts.banner = "Usage: bin/code [options]"
+    opts.banner = "Usage: template [options]"
+
+    opts.on(
+      "-v",
+      "--version",
+      "Version of template"
+    ) do |input|
+      puts Code::Version
+      exit
+    end
 
     opts.on(
       "-i INPUT",
       "--input=INPUT",
       "Input in the code language (String or File)"
     ) do |input|
-      input = File.read(input) if File.exists?(input)
+      input = File.read(input) if File.exist?(input)
 
       options[:input] = input
     end
@@ -24,7 +33,7 @@ OptionParser
       "--context=CONTEXT",
       "Context in the code language (String or File)"
     ) do |context|
-      context = File.read(context) if File.exists?(context)
+      context = File.read(context) if File.exist?(context)
 
       options[:context] = context
     end
@@ -46,6 +55,15 @@ OptionParser
       require "ruby-prof"
       options[:profile] = true
     end
+
+    opts.on(
+      "--profiler TYPE",
+      "Profiler output type (text (default) or html)"
+    ) do |profiler|
+      require "ruby-prof"
+      options[:profile] = true
+      options[:profiler] = profiler
+    end
   end
   .parse!
 
@@ -57,20 +75,20 @@ if options[:profile]
 end
 
 if options[:parse]
-  pp ::Code::Parser.parse(input).to_raw
+  pp Code::Parser.parse(input).to_raw
 else
-  print(
-    Code.evaluate(
-      input,
-      context,
-      io: $stdout,
-      timeout: options[:timeout]
-    ).to_s
-  )
+  print Code.evaluate(input, context, io: $stdout, timeout: options[:timeout])
 end
 
 if options[:profile]
   result = RubyProf.stop
-  printer = RubyProf::FlatPrinter.new(result)
-  printer.print($stdout)
+  if options[:profiler] == "text"
+    printer = RubyProf::FlatPrinter.new(result)
+    printer.print($stdout)
+  elsif options[:profiler] == "html"
+    printer = RubyProf::GraphHtmlPrinter.new(result)
+    printer.print($stdout)
+  else
+    abort "#{options[:profiler]} not recognized"
+  end
 end

data/code-ruby.gemspec

@@ -1,8 +1,8 @@
-require_relative "lib/template/version"
+require_relative "lib/code/version"
 
 Gem::Specification.new do |s|
   s.name = "code-ruby"
-  s.version = ::Template::Version
+  s.version = ::Code::Version
   s.summary = "A programming language"
   s.description = 'A programming language, like Code.evaluate("1 + 1") # => 2'
   s.authors = ["Dorian Marié"]
@@ -10,8 +10,10 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($/)
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
-  s.homepage = "https://github.com/dorianmariefr/template-ruby"
+  s.homepage = "https://github.com/dorianmariefr/code-ruby"
   s.license = "MIT"
+  s.executables = "code"
 
   s.add_dependency "zeitwerk", "~> 2"
+  s.add_dependency "language-ruby", "~> 0"
 end

data/lib/code/error.rb

@@ -1,18 +1,29 @@
+# frozen_string_literal: true
+
 class Code
   class Error < StandardError
-    class TypeError < ::Code::Error
+    class ArityError < Error
+    end
+
+    class TypeError < Error
+    end
+
+    class TypeError < Error
+    end
+
+    class Undefined < Error
     end
 
-    class Undefined < ::Code::Error
+    class UndefinedVariable < Error
     end
 
-    class UndefinedVariable < ::Code::Error
+    class ArgumentError < Error
     end
 
-    class ArgumentError < ::Code::Error
+    class IncompatibleContext < Error
     end
 
-    class IncompatibleContext < ::Code::Error
+    class KeyNotFound < Error
     end
   end
 end

data/lib/code/node/base_10.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Base10 < Node
@@ -16,9 +18,9 @@ class Code
           exponent = @exponent.evaluate(**args)
 
           if exponent.is_a?(::Code::Object::Integer)
-            ::Code::Object::Integer.new(@whole.to_i, exponent: exponent)
+            ::Code::Object::Integer.new(@whole.to_i, exponent:)
           else
-            ::Code::Object::Decimal.new(@whole, exponent: exponent)
+            ::Code::Object::Decimal.new(@whole, exponent:)
           end
         else
           ::Code::Object::Integer.new(@whole.to_i)

data/lib/code/node/base_16.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Base16 < Node
@@ -5,7 +7,7 @@ class Code
         @base_16 = parsed
       end
 
-      def evaluate(**args)
+      def evaluate(**_args)
         ::Code::Object::Integer.new(@base_16.to_i(16))
       end
     end

data/lib/code/node/base_2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Base2 < Node
@@ -5,7 +7,7 @@ class Code
         @base_2 = parsed
       end
 
-      def evaluate(**args)
+      def evaluate(**_args)
         ::Code::Object::Integer.new(@base_2.to_i(2))
       end
     end

data/lib/code/node/base_8.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Base8 < Node
@@ -5,7 +7,7 @@ class Code
         @base_8 = parsed
       end
 
-      def evaluate(**args)
+      def evaluate(**_args)
         ::Code::Object::Integer.new(@base_8.to_i(8))
       end
     end

data/lib/code/node/boolean.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Boolean < Node
@@ -8,13 +10,13 @@ class Code
         @boolean = parsed
       end
 
-      def evaluate(**args)
+      def evaluate(**_args)
         if @boolean == TRUE_KEYWORD
           ::Code::Object::Boolean.new(true)
         elsif @boolean == FALSE_KEYWORD
           ::Code::Object::Boolean.new(false)
         else
-          raise NotImplementedError.new(@boolean)
+          raise NotImplementedError, @boolean
         end
       end
     end

data/lib/code/node/call.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Call < Node
@@ -6,16 +8,16 @@ class Code
           @parameters =
             parsed
               .delete(:parameters) { [] }
-              .map { |parameter| Node::FunctionParameter.new(parameter) }
+              .map { |parameter| FunctionParameter.new(parameter) }
 
-          @body = Node::Code.new(parsed.delete(:body))
+          @body = Code.new(parsed.delete(:body))
 
           super(parsed)
         end
 
-        def evaluate(**args)
-          ::Code::Object::Argument.new(
-            ::Code::Object::Function.new(parameters: @parameters, body: @body)
+        def evaluate(**_args)
+          Object::Argument.new(
+            Object::Function.new(parameters: @parameters, body: @body)
           )
         end
       end
@@ -25,22 +27,43 @@ class Code
         @arguments =
           parsed
             .delete(:arguments) { [] }
-            .map { |argument| Node::CallArgument.new(argument) }
+            .map { |argument| CallArgument.new(argument) }
 
-        if parsed.key?(:block)
-          @block = Node::Call::Block.new(parsed.delete(:block))
-        end
+        @block = Call::Block.new(parsed.delete(:block)) if parsed.key?(:block)
 
         super(parsed)
       end
 
       def evaluate(**args)
-        arguments = @arguments.map { |argument| argument.evaluate(**args) }
+        arguments = []
+
+        @arguments.each do |argument|
+          if argument.keyword?
+            if arguments.last&.value.is_a?(Object::Dictionary)
+              arguments.last.value[argument.name] = argument.evaluate(
+                **args
+              ).value
+            else
+              arguments << Object::Argument.new(
+                Object::Dictionary.new(
+                  { argument.name => argument.evaluate(**args).value }
+                )
+              )
+            end
+          else
+            arguments << argument.evaluate(**args)
+          end
+        end
+
         arguments << @block.evaluate(**args) if @block
 
-        name = ::Code::Object::String.new(@name)
+        name = Object::String.new(@name)
+
+        args.fetch(:object).call(operator: name, arguments:, **args)
+      end
 
-        args.fetch(:object).call(operator: name, arguments: arguments, **args)
+      def resolve(**_args)
+        Object::String.new(@name)
       end
     end
   end

data/lib/code/node/call_argument.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class CallArgument < Node
@@ -8,14 +10,23 @@ class Code
 
       def evaluate(**args)
         if @name
-          ::Code::Object::Argument.new(
-            @value.evaluate(**args),
-            name: ::Code::Object::String.new(@name)
-          )
+          Object::Argument.new(@value.evaluate(**args), name:)
         else
-          ::Code::Object::Argument.new(@value.evaluate(**args))
+          Object::Argument.new(@value.evaluate(**args))
         end
       end
+
+      def keyword?
+        !!@name
+      end
+
+      def regular?
+        !keyword?
+      end
+
+      def name
+        Object::String.new(@name)
+      end
     end
   end
 end

data/lib/code/node/code.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Code < Node
       def initialize(parsed)
-        @statements = parsed.map { |statement| Node::Statement.new(statement) }
+        @statements = parsed.map { |statement| Statement.new(statement) }
       end
 
       def evaluate(**args)
-        last = ::Code::Object::Nothing.new
+        last = Object::Nothing.new
 
         @statements.each do |statement|
-          last =
-            statement.evaluate(**args.merge(object: ::Code::Object::Global.new))
+          last = statement.evaluate(**args.merge(object: Object::Global.new))
         end
 
         last

data/lib/code/node/decimal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Decimal < Node

data/lib/code/node/{dictionnary.rb → dictionary.rb}

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Code
   class Node
-    class Dictionnary < Node
+    class Dictionary < Node
       class KeyValue < Node
         def initialize(parsed)
           if parsed.key?(:statement)
@@ -9,22 +11,29 @@ class Code
             @key = Node::String.new([{ text: parsed.delete(:name) }])
           end
 
-          @value = Node::Code.new(parsed.delete(:value))
+          @value = Node::Code.new(parsed.delete(:value)) if parsed[:value]
         end
 
         def evaluate(**args)
-          [@key.evaluate(**args), @value.evaluate(**args)]
+          key = @key.evaluate(**args)
+
+          if @value
+            value = @value.evaluate(**args)
+            [key, value]
+          else
+            [key, key]
+          end
         end
       end
 
       def initialize(parsed)
         parsed = [] if parsed == ""
         @key_values =
-          parsed.map { |key_value| Node::Dictionnary::KeyValue.new(key_value) }
+          parsed.map { |key_value| Node::Dictionary::KeyValue.new(key_value) }
       end
 
       def evaluate(**args)
-        ::Code::Object::Dictionnary.new(
+        ::Code::Object::Dictionary.new(
           @key_values.map { |key_value| key_value.evaluate(**args) }.to_h
         )
       end

data/lib/code/node/function.rb

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class Function < Node
       def initialize(parsed)
+        @parameters = parsed.delete(:parameters) { [] }
+        @parameters = [] if @parameters.empty?
+
         @parameters =
-          parsed
-            .delete(:parameters) { [] }
-            .map { |parameter| Node::FunctionParameter.new(parameter) }
+          @parameters.map { |parameter| Node::FunctionParameter.new(parameter) }
 
         @body = Node::Code.new(parsed.delete(:body))
 
         super(parsed)
       end
 
-      def evaluate(**args)
+      def evaluate(**_args)
         ::Code::Object::Function.new(parameters: @parameters, body: @body)
       end
     end

data/lib/code/node/function_parameter.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class FunctionParameter < Node
       def initialize(parsed)
         @name = parsed.delete(:name)
-        @keyword = !!parsed.delete(:keyword)
+        @keyword = !parsed.delete(:keyword).nil?
         super(parsed)
       end
 

data/lib/code/node/if.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Code
   class Node
     class If < Node
@@ -13,9 +15,9 @@ class Code
           @operator = parsed.delete(:operator)
           @body = Node::Code.new(parsed.delete(:body))
 
-          if parsed.key?(:statement)
-            @statement = Node::Statement.new(parsed.delete(:statement))
-          end
+          return unless parsed.key?(:statement)
+
+          @statement = Node::Statement.new(parsed.delete(:statement))
         end
       end