dagon 0.1.1 → 0.1.2

data/bin/dagon

@@ -3,8 +3,8 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..")
 
 require 'optparse'
-require './build/scanner'
-require './build/parser'
+require 'build/scanner'
+require 'build/parser'
 require 'pp'
 
 

data/bin/dspec

@@ -2,8 +2,8 @@
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..")
 
-require './build/scanner'
-require './build/parser'
+require 'build/scanner'
+require 'build/parser'
 require 'core/vm'
 
 def run_tests files

data/bin/idgr

@@ -3,8 +3,8 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..")
 
 require 'readline'
-require './build/scanner'
-require './build/parser'
+require 'build/scanner'
+require 'build/parser'
 
 vm = Dagon::Core::VM.new
 filename = '(stdin)'

data/build/parser.rb

@@ -11,7 +11,7 @@ require 'racc/parser.rb'
   string_node literal_node var_ref_node if_node assignment_node while_node
   class_definition_node instance_init_node block_node hash_node array_node
   unary_function_call_node constant_ref_node instance_var_ref_node
-).each { |node| require_relative "../dagon/ast/#{node}" }
+).each { |node| require "ast/#{node}" }
 
 module Dagon
   class Parser < Racc::Parser
@@ -540,35 +540,35 @@ Racc_debug_parser = true
 
 module_eval(<<'.,.,', 'parser.y', 11)
   def _reduce_1(val, _values, result)
-     result = [] 
+     result = []
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 12)
   def _reduce_2(val, _values, result)
-     result = AST::RootNode.new(val[0]) 
+     result = AST::RootNode.new(val[0])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 14)
   def _reduce_3(val, _values, result)
-     result = val[1] 
+     result = val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 16)
   def _reduce_4(val, _values, result)
-     result.push val[1] 
+     result.push val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 17)
   def _reduce_5(val, _values, result)
-     result = [val[0]] 
+     result = [val[0]]
     result
   end
 .,.,
@@ -587,112 +587,112 @@ module_eval(<<'.,.,', 'parser.y', 17)
 
 module_eval(<<'.,.,', 'parser.y', 26)
   def _reduce_12(val, _values, result)
-     result = AST::WhileNode.new(@filename, nil, val[1], val[2]) 
+     result = AST::WhileNode.new(@filename, nil, val[1], val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 28)
   def _reduce_13(val, _values, result)
-     result = AST::IfNode.new(@filename, nil, val[1], val[2], val[3]) 
+     result = AST::IfNode.new(@filename, nil, val[1], val[2], val[3])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 29)
   def _reduce_14(val, _values, result)
-     result = nil 
+     result = nil
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 30)
   def _reduce_15(val, _values, result)
-     result = [AST::IfNode.new(@filename, nil, val[1], val[2], val[3])] 
+     result = [AST::IfNode.new(@filename, nil, val[1], val[2], val[3])]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 31)
   def _reduce_16(val, _values, result)
-     result = val[1] 
+     result = val[1]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 33)
   def _reduce_17(val, _values, result)
-     result = AST::ClassDefinitionNode.new(@filename, nil, val[0].data, val[2]) 
+     result = AST::ClassDefinitionNode.new(@filename, nil, val[0].data, val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 36)
   def _reduce_18(val, _values, result)
-     result = AST::AssignmentNode.new(@filename, nil, val[0].variable_name, val[2]) 
+     result = AST::AssignmentNode.new(@filename, nil, val[0].variable_name, val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 37)
   def _reduce_19(val, _values, result)
-     result = AST::AssignmentNode.new(@filename, nil, "@#{val[1].variable_name}", val[3]) 
+     result = AST::AssignmentNode.new(@filename, nil, "@#{val[1].variable_name}", val[3])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 39)
   def _reduce_20(val, _values, result)
-     result = call_on_object(val[0], '-', val[2]) 
+     result = call_on_object(val[0], '-', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 40)
   def _reduce_21(val, _values, result)
-     result = call_on_object(val[0], '+', val[2]) 
+     result = call_on_object(val[0], '+', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 41)
   def _reduce_22(val, _values, result)
-     result = call_on_object(val[0], '*', val[2]) 
+     result = call_on_object(val[0], '*', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 42)
   def _reduce_23(val, _values, result)
-     result = call_on_object(val[0], '/', val[2]) 
+     result = call_on_object(val[0], '/', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 43)
   def _reduce_24(val, _values, result)
-     result = call_on_object(val[0], '&&', val[2]) 
+     result = call_on_object(val[0], '&&', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 44)
   def _reduce_25(val, _values, result)
-     result = call_on_object(val[0], '||', val[2]) 
+     result = call_on_object(val[0], '||', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 45)
   def _reduce_26(val, _values, result)
-     result = call_on_object(val[0], '^', val[2]) 
+     result = call_on_object(val[0], '^', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 46)
   def _reduce_27(val, _values, result)
-     result = call_on_object(val[0], '**', val[2]) 
+     result = call_on_object(val[0], '**', val[2])
     result
   end
 .,.,
@@ -701,49 +701,49 @@ module_eval(<<'.,.,', 'parser.y', 46)
 
 module_eval(<<'.,.,', 'parser.y', 49)
   def _reduce_29(val, _values, result)
-     result = AST::UnaryFunctionCallNode.new(@filename, nil, val[1], "!") 
+     result = AST::UnaryFunctionCallNode.new(@filename, nil, val[1], "!")
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 51)
   def _reduce_30(val, _values, result)
-     result = call_on_object(val[0], '>', val[2]) 
+     result = call_on_object(val[0], '>', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 52)
   def _reduce_31(val, _values, result)
-     result = call_on_object(val[0], '<', val[2]) 
+     result = call_on_object(val[0], '<', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 53)
   def _reduce_32(val, _values, result)
-     result = call_on_object(val[0], '<=', val[2]) 
+     result = call_on_object(val[0], '<=', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 54)
   def _reduce_33(val, _values, result)
-     result = call_on_object(val[0], '>=', val[2]) 
+     result = call_on_object(val[0], '>=', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 55)
   def _reduce_34(val, _values, result)
-     result = call_on_object(val[0], '=', val[2]) 
+     result = call_on_object(val[0], '=', val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 56)
   def _reduce_35(val, _values, result)
-     result = call_on_object(val[0], '!=', val[2]) 
+     result = call_on_object(val[0], '!=', val[2])
     result
   end
 .,.,
@@ -754,105 +754,105 @@ module_eval(<<'.,.,', 'parser.y', 56)
 
 module_eval(<<'.,.,', 'parser.y', 60)
   def _reduce_38(val, _values, result)
-     result = AST::HashNode.new(@filename, nil, val[1]) 
+     result = AST::HashNode.new(@filename, nil, val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 61)
   def _reduce_39(val, _values, result)
-     result = [] 
+     result = []
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 62)
   def _reduce_40(val, _values, result)
-     result = val 
+     result = val
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 63)
   def _reduce_41(val, _values, result)
-     result << val 
+     result << val
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 64)
   def _reduce_42(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 66)
   def _reduce_43(val, _values, result)
-     result = AST::ArrayNode.new(@filename, nil, val[1]) 
+     result = AST::ArrayNode.new(@filename, nil, val[1])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 67)
   def _reduce_44(val, _values, result)
-     result = [] 
+     result = []
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 68)
   def _reduce_45(val, _values, result)
-     result = val 
+     result = val
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 69)
   def _reduce_46(val, _values, result)
-     result.push val[2] 
+     result.push val[2]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 70)
   def _reduce_47(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 71)
   def _reduce_48(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 74)
   def _reduce_49(val, _values, result)
-     result = AST::VarRefNode.new(@filename, nil, val[0].data) 
+     result = AST::VarRefNode.new(@filename, nil, val[0].data)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 76)
   def _reduce_50(val, _values, result)
-     result = AST::InstanceVarRefNode.new(@filename, nil, "@#{val[1].data}") 
+     result = AST::InstanceVarRefNode.new(@filename, nil, "@#{val[1].data}")
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 77)
   def _reduce_51(val, _values, result)
-     result = AST::VarRefNode.new(@filename, nil, val[0].data) 
+     result = AST::VarRefNode.new(@filename, nil, val[0].data)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 78)
   def _reduce_52(val, _values, result)
-     result = AST::ConstantRefNode.new(@filename, nil, val[0].data) 
+     result = AST::ConstantRefNode.new(@filename, nil, val[0].data)
     result
   end
 .,.,
@@ -869,140 +869,140 @@ module_eval(<<'.,.,', 'parser.y', 78)
 
 module_eval(<<'.,.,', 'parser.y', 85)
   def _reduce_58(val, _values, result)
-     result = AST::LiteralNode.new(@filename, nil, val[0].data.to_f) 
+     result = AST::LiteralNode.new(@filename, nil, val[0].data.to_f)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 86)
   def _reduce_59(val, _values, result)
-     result = AST::LiteralNode.new(@filename, nil, val[0].data.to_i) 
+     result = AST::LiteralNode.new(@filename, nil, val[0].data.to_i)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 87)
   def _reduce_60(val, _values, result)
-     result = AST::StringNode.new(@filename, nil, val[0].data) 
+     result = AST::StringNode.new(@filename, nil, val[0].data)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 88)
   def _reduce_61(val, _values, result)
-     result = AST::LiteralNode.new(@filename, nil, true) 
+     result = AST::LiteralNode.new(@filename, nil, true)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 89)
   def _reduce_62(val, _values, result)
-     result = AST::LiteralNode.new(@filename, nil, false) 
+     result = AST::LiteralNode.new(@filename, nil, false)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 90)
   def _reduce_63(val, _values, result)
-     result = AST::LiteralNode.new(@filename, nil, nil) 
+     result = AST::LiteralNode.new(@filename, nil, nil)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 93)
   def _reduce_64(val, _values, result)
-     result = AST::FunctionDefinitionNode.new(@filename, nil, val[0].variable_name, AST::Function.new(@filename, nil, [], val[2])) 
+     result = AST::FunctionDefinitionNode.new(@filename, nil, val[0].variable_name, AST::Function.new(@filename, nil, [], val[2]))
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 94)
   def _reduce_65(val, _values, result)
-     result = AST::FunctionDefinitionNode.new(@filename, nil, val[0].variable_name, AST::Function.new(@filename, nil, val[2], val[5])) 
+     result = AST::FunctionDefinitionNode.new(@filename, nil, val[0].variable_name, AST::Function.new(@filename, nil, val[2], val[5]))
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 96)
   def _reduce_66(val, _values, result)
-     result = AST::FunctionCallNode.new(@filename, nil, val[0], val[2].variable_name, [], val[3]) 
+     result = AST::FunctionCallNode.new(@filename, nil, val[0], val[2].variable_name, [], val[3])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 97)
   def _reduce_67(val, _values, result)
-     result = AST::FunctionCallNode.new(@filename, nil, val[0], val[2].variable_name, val[4], val[6]) 
+     result = AST::FunctionCallNode.new(@filename, nil, val[0], val[2].variable_name, val[4], val[6])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 98)
   def _reduce_68(val, _values, result)
-     result = AST::FunctionCallNode.new(@filename, nil, nil, val[0].variable_name, val[2], val[4]) 
+     result = AST::FunctionCallNode.new(@filename, nil, nil, val[0].variable_name, val[2], val[4])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 99)
   def _reduce_69(val, _values, result)
-     result = AST::FunctionCallNode.new(@filename, nil, val[0], '[]', [val[2]], nil) 
+     result = AST::FunctionCallNode.new(@filename, nil, val[0], '[]', [val[2]], nil)
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 101)
   def _reduce_70(val, _values, result)
-     result = AST::InstanceInitNode.new(@filename, nil, val[0].data, val[2], val[4]) 
+     result = AST::InstanceInitNode.new(@filename, nil, val[0].data, val[2], val[4])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 103)
   def _reduce_71(val, _values, result)
-     result = AST::BlockNode.new(@filename, nil, val[4], val[2]) 
+     result = AST::BlockNode.new(@filename, nil, val[4], val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 104)
   def _reduce_72(val, _values, result)
-     result = AST::BlockNode.new(@filename, nil, val[1], []) 
+     result = AST::BlockNode.new(@filename, nil, val[1], [])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 106)
   def _reduce_73(val, _values, result)
-     result = AST::BlockNode.new(@filename, nil, [val[5]], val[2]) 
+     result = AST::BlockNode.new(@filename, nil, [val[5]], val[2])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 107)
   def _reduce_74(val, _values, result)
-     result = AST::BlockNode.new(@filename, nil, [val[2]], []) 
+     result = AST::BlockNode.new(@filename, nil, [val[2]], [])
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 108)
   def _reduce_75(val, _values, result)
-     result = nil 
+     result = nil
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 109)
   def _reduce_76(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'parser.y', 110)
   def _reduce_77(val, _values, result)
-     result = val[0] 
+     result = val[0]
     result
   end
 .,.,

data/dagon.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "dagon"
-  gem.version       = "0.1.1"
+  gem.version       = "0.1.2"
   gem.authors       = ["Caleb Thompson", "Matt Mongeau"]
   gem.email         = ["cjaysson@gmail.com", "halogenandtoast@gmail.com"]
   gem.description   = "The Dagon programming language: whitespace, enumerators, blocks, One Way"
@@ -10,8 +10,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/calebthompson/dagon"
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/(dagon|dspec|idgr)}).map{ |f| File.basename(f) }
-  gem.require_paths = %w{core dagon}
+  gem.executables   = gem.files.grep(%r{^bin/(dagon|idgr)}).map{ |f| File.basename(f) }
+  gem.require_paths = %w{. dagon}
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'racc'

data/dagon/parser.y

@@ -116,7 +116,7 @@ rule
   string_node literal_node var_ref_node if_node assignment_node while_node
   class_definition_node instance_init_node block_node hash_node array_node
   unary_function_call_node constant_ref_node instance_var_ref_node
-).each { |node| require_relative "../dagon/ast/#{node}" }
+).each { |node| require "ast/#{node}" }
 
 ---- inner
 

metadata

@@ -2,7 +2,7 @@
 name: dagon
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Caleb Thompson
@@ -67,7 +67,6 @@ email:
 - halogenandtoast@gmail.com
 executables:
 - dagon
-- dspec
 - idgr
 extensions: []
 extra_rdoc_files: []
@@ -156,7 +155,7 @@ licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
-- core
+- .
 - dagon
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false