klam 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3c2a2a79c7fc9bd757b979c7e30ddb9db372ee3
-  data.tar.gz: 331259be37b2fd3c7581bd65907b3c0bfbebae5d
+  metadata.gz: bc3dcaef0efecdb916e9c2907f08db38c0ea5a5e
+  data.tar.gz: a5751310c733519a4815040f0005fff1f36196b3
 SHA512:
-  metadata.gz: 3803840c457f33c6d61b0615fe8f09199829ee71ca1f22e4ec3a1c3ada28439e648a404266f2242e755fec8bca9f60b9a9043ef20f7936ae5e40866cc9de3ef5
-  data.tar.gz: 7485c26bc1e70d7d0b45b4d7fba90162b9110af12d7a729133ba0c298b54d2f5af8650a7453dd610f773e8ea2c630b52d1a26eb07e30a66455521324562bff8d
+  metadata.gz: 41d80904122f50bbd3b1d7c1586e5666e44f38135d680ae5ca81844df4ca100c693bdc9f031eaf6b698f76881fe5f2db916b80a9d340981839481d23ff725802
+  data.tar.gz: 9635963254c84641c58e9d69f3bb4a803fd7e1702a0b7360b7b3a397ac940ffa04a3674f248be4d1224a8f964336420fe0da1590e1276e75f07fd4ea44b8209f

data/HISTORY.asciidoc

@@ -1,6 +1,24 @@
 Relase History
 ==============
 
+v0.0.7 -- February 24, 2015
+---------------------------
+New Features
+~~~~~~~~~~~~
+* Debugging output enabled by global flags:
+** `*dump-kl*` causes the KLambda code received by the compiler to be dumped
+   to stdout.
+** `*dump-rb*` causes the Ruby code generated by the compiler to be dumped
+   to stdout.
+** `*include-backtrace-in-error-string*` causes the backtrace from the error
+   object to be appended to the string returned by error-to-string.
+
+Bug Fixes
+~~~~~~~~~
+* Carriage return and new line are now properly escaped in emitted Ruby code. This
+  fixes "warning: encountered \r in middle of line, treated as a mere space" messages
+  that show up, e.g., when using a unit string like "c#13;" in Shen.
+
 v0.0.6 -- February 1, 2015
 --------------------------
 Breaking Changes

data/lib/klam/compilation_stages/emit_ruby.rb

@@ -193,7 +193,7 @@ module Klam
       end
 
       def emit_string(str)
-        "'" + escape_string(str) + "'"
+        str.inspect
       end
 
       def emit_symbol(sym)
@@ -211,23 +211,6 @@ module Klam
         render_string('(begin; $2; rescue => $1; $3; end)', err_var_rb,
                       expr_rb, apply_handler_rb)
       end
-
-      # Escape single quotes and backslashes
-      def escape_string(str)
-        new_str = ""
-        str.each_char do |c|
-          if c == "'"
-            new_str << "\\"
-            new_str << "'"
-          elsif c == '\\'
-            new_str << '\\'
-            new_str << '\\'
-          else
-            new_str << c
-          end
-        end
-        new_str
-      end
     end
   end
 end

data/lib/klam/environment.rb

@@ -34,6 +34,9 @@ module Klam
 
       # The open primitive depends on having *home-directory* assigned.
       set(:"*home-directory*", ::Dir.pwd)
+      set(:"*dump-kl*", false)
+      set(:"*dump-rb*", false)
+      set(:"*include-backtrace-in-error-string*", false)
     end
 
     def __apply(rator, *rands)

data/lib/klam/primitives/error_handling.rb

@@ -10,7 +10,11 @@ module Klam
       # trap-error is a special form and implemented in the compiler
 
       def error_to_string(err)
-        err.message
+        if value(:"*include-backtrace-in-error-string*")
+          ([err.message] + err.backtrace).join("\n")
+        else
+          err.message
+        end
       end
       alias_method :"error-to-string", :error_to_string
       remove_method :error_to_string

data/lib/klam/primitives/generic_functions.rb

@@ -8,7 +8,9 @@ module Klam
       remove_method :equal
 
       def eval_kl(form)
+        ::Kernel.puts form.inspect if value(:"*dump-kl*")
         code = @compiler.compile(form)
+        ::Kernel.puts code if value(:"*dump-rb*")
         instance_eval code
       end
       alias_method :"eval-kl", :eval_kl

data/lib/klam/version.rb

@@ -1,3 +1,3 @@
 module Klam
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/unit/klam/primitives/error_handling_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe Klam::Primitives::ErrorHandling do
   include Klam::Primitives::ErrorHandling
 
+  def value(sym)
+    false
+  end
+
   describe '#simple-error' do
     it 'raises an error having the supplied message' do
       expect {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klam
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Greg Spurrier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake