rquark 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f5ed59ebb0aa183f08891641442522607cacb41
-  data.tar.gz: b88075ef7e13092632e133531951b0b04bcf0bc5
+  metadata.gz: 2c9a10fb24ac8bdaec8170bff6f1ab76f4216d7d
+  data.tar.gz: 6a0bb87e2188b21bd2d2c93577b6e131e47d9cca
 SHA512:
-  metadata.gz: fbabfc4e5f510a525e5f5483c513b2df34fd5fe1eb8b3c49019dde65001074cdcbbe562fbcd8b852d5299dd793478b920e79751b85f3acc7f602fa60ce40309d
-  data.tar.gz: d516b15258ac26248f64f71174259d74c223f72dac2d5872d909f5c89a3dbd316a0e1a7368f97a1eb78ca2668f0509aa119c823e8ed7e75bca89e08914633138
+  metadata.gz: 1518e78f0b9e5c6dc4bc39e5de030895982f39c929c7179f2bf3096386d48c7946bcf1dbf799581c604fbd66cd2e79bfc4dcc39d7dc189c1c24506fad9326158
+  data.tar.gz: 30662b7ebba927eebbc94924bc73d7754e2e0b0dd053f3c3f411bca6600a1f03f4f23393226ec68a7a75a8353ec3e87d8ced5f65ca6c867e9819e7bbc6545c97

data/lib/qeval.rb

@@ -1,4 +1,5 @@
 require 'qtypes'
+require 'qparse'
 
 ## Boilerplate ##
 
@@ -12,10 +13,10 @@ def def_cf(name, type_sig, &code)
   $core_func[name] = code
 end
 
-def apply_core_func(name, vm, eval_func)
+def apply_core_func(name, vm)
   eq, expected, got = type_check(vm.stack, $core_func_type[name])
   raise(QuarkError, "Type error with function #{name}\n  expected a stack of #{expected}\n  but got #{got}") if not eq
-  $core_func[name].call(vm, eval_func)
+  $core_func[name].call(vm)
 end
 
 def apply_runtime_func(name, vm)
@@ -129,11 +130,10 @@ def_cf('def', [:Quote, :Sym]) do |vm|
   vm.bindings[name] = quote
 end
 
-def_cf('eval', [:Str]) do |vm, eval_func|
+def_cf('parse', [:Str]) do |vm|
   begin
-    eval_str = vm.stack.pop.val
-    vm2 = eval_func.call(eval_str, vm.stack.dup, vm.bindings.dup)
-    vm.stack, vm.bindings = vm2.stack, vm2.bindings
+    parse_str = vm.stack.pop.val
+    vm.stack.push QQuote.new([], qparse(parse_str))
     vm.stack.push QSym.new('ok')
   rescue
     vm.stack.push QSym.new('not-ok')

data/lib/qrun.rb

@@ -16,7 +16,7 @@ def qreduce vm
     if item.is_a? QAtom
       f_name = item.val.strip
       if $core_func.has_key? f_name
-        apply_core_func(f_name, vm, ->(*x){qrun(*x)})
+        apply_core_func(f_name, vm)
       elsif vm.bindings.has_key? f_name
         quote = vm.bindings[f_name]
         vm.program.unshift(*[quote.dup, QAtom.new('call')])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rquark
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - "⊥"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet