conflisp 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e85b7514e76a0fb5709c69c5cafaa87cdd42be254f708acf48564e30ea4712
-  data.tar.gz: 6d39a6a091b1e2e8de18f875efcdea4b14d19c686ea2c626bb1f67a032f0824c
+  metadata.gz: 18669bdb4f911170fd797560041c0483aa4e5ed869a586e080000afc46603c63
+  data.tar.gz: 9a86ec4435640d5983b46a874abc4fbe0c1c50ec5ceaccc937754fa2598b11db
 SHA512:
-  metadata.gz: 3bdaf8b254d7c0deeb2ba60e5e81bcc9718f5382e726bc4396655378fddfe38f5ba674549dcc3d54fcade64bef81acc4ef634f983ee648e00c93219026225bd3
-  data.tar.gz: 9faf45a09a04e50e634e5ba5ce2556931c82ea5487d43e530ad8fec0d3fc317540411dfbc8dbcdc3e2e669e2c223ddd420ad90c1d7c18adf86757785a6ed91f4
+  metadata.gz: 8a12a5bc2b3b9f1c2ebd965c2296cb3a2082d88ba65084ac13deedb0006fc5bb8043d592d05c2aae0114623d5ebff02497d22a2654fec83413db2595f877853f
+  data.tar.gz: a96e3993311539fa5152704047fc1a32e72fa52bd991992082c5129ff0e3307ea68b707be612deb6e896bbe09685f4537b4d8a73ffac525fdf6ad09d2f49ea79

data/lib/conflisp/conflisp_error.rb

@@ -1,5 +1,24 @@
 # frozen_string_literal: true
 
 module Conflisp
-  ConflispError = Class.new(StandardError)
+  # Base class for ConflispError
+  class ConflispError < StandardError
+    attr_reader :conflisp_stack
+
+    def initialize(*args)
+      super
+
+      @conflisp_stack = []
+    end
+
+    def to_s
+      ret = super
+
+      conflisp_stack.each do |expression|
+        ret += "\n  in expression #{expression}"
+      end
+
+      ret
+    end
+  end
 end

data/lib/conflisp/evaluator.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'conflisp/method_missing'
+require 'conflisp/runtime_error'
 
 module Conflisp
   # Evaluator takes s-expressions and resolves them into Ruby values
@@ -16,17 +17,13 @@ module Conflisp
       case expression
       when Array
         # In Lisp, Arrays are function calls
-        fn, *raw_args = expression
-        fn = fn.to_s
+        fn_name, *raw_args = expression
+        fn_name = fn_name.to_s
         args = raw_args.map { |arg| resolve(arg) }
-        if fn == 'global'
+        if fn_name == 'global'
           globals.dig(*args)
-        elsif fn_defined?(fn)
-          apply(fn, *args)
         else
-          # TODO: It would be nice to get error messages with a stacktrace or at
-          # least some context about the parent expressions
-          raise MethodMissing, "Unknown fn #{fn} in expression #{expression}"
+          apply(fn_name, *args)
         end
       when Hash
         expression.transform_values do |value|
@@ -35,14 +32,20 @@ module Conflisp
       else
         expression
       end
-    end
-
-    def fn_defined?(fn_name)
-      registry.key?(fn_name)
+    rescue Conflisp::ConflispError => e
+      e.conflisp_stack << expression
+      raise e
     end
 
     def apply(fn_name, *args)
-      instance_exec(*args, &registry[fn_name])
+      method = registry[fn_name]
+      raise Conflisp::MethodMissing, fn_name unless method
+
+      begin
+        instance_exec(*args, &method)
+      rescue StandardError => e
+        raise Conflisp::RuntimeError.new(e, [fn_name, *args])
+      end
     end
   end
 end

data/lib/conflisp/method_missing.rb

@@ -3,5 +3,11 @@
 require 'conflisp/conflisp_error'
 
 module Conflisp
-  MethodMissing = Class.new(ConflispError)
+  # Error raised when a function is not found
+  class MethodMissing < ConflispError
+    def initialize(fn_name)
+      message = "Unknown fn `#{fn_name}`"
+      super(message)
+    end
+  end
 end

data/lib/conflisp/runtime_error.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'conflisp/conflisp_error'
+
+module Conflisp
+  # Error raised when evaluation of a Conflisp expression fails
+  class RuntimeError < ConflispError
+    attr_reader :original_error
+
+    def initialize(error, expression)
+      message = "#{error.class.name}: #{error.message}"
+      message += "\n  while evaluating #{expression}"
+      super(message)
+
+      @original_error = error
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conflisp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Rocky Meza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,28 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.93.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: 0.93.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.19.0
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: 
 email:
 - rocky@geteverwise.com
@@ -79,6 +93,7 @@ files:
 - lib/conflisp/evaluator.rb
 - lib/conflisp/language.rb
 - lib/conflisp/method_missing.rb
+- lib/conflisp/runtime_error.rb
 homepage: https://github.com/everwise/conflisp
 licenses:
 - MIT
@@ -91,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="