kotodama 1.0.1 → 1.0.2

data/lib/kotodama.rb

@@ -1,7 +1,7 @@
 require 'kaiseki'
 
 module Kotodama
-	VERSION = '1.0.1'
+	VERSION = '1.0.2'
 	file_path = File.dirname __FILE__
 	
 	#load base class mods
@@ -15,4 +15,4 @@ module Kotodama
 	
 	#load parser
 	require file_path + '/kotodama_grammar'
-end
+end

data/lib/kotodama_grammar.rb

@@ -13,7 +13,7 @@ module Kotodama
 		end
 		
 		rule :option do
-			parses :LITERAL & '=>'.skip & :ATOM & ';'.skip
+			parses :LITERAL & '=>'.skip & (:ATOM | :INT) & ';'.skip
 			node [:key, :value]
 			action do
 				@language.options[@key] = @value

data/lib/rule.rb

@@ -10,7 +10,7 @@ module Kotodama
 		
 		def add expression, weight
 			@expressions << expression
-			@weights << (weight || 1)
+			@weights << (weight || @language.options['$rule_weight'] || 1)
 		end
 		
 		def generate

data/lib/type.rb

@@ -10,7 +10,7 @@ module Kotodama
 		
 		def add symbol, weight
 			@symbols << symbol
-			@weights << (weight || 1)
+			@weights << (weight || @language.options['$type_weight'] || 1)
 		end
 		
 		def member? symbol

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - William Hamilton-Levi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,6 @@ files:
 - lib/mod_array.rb
 - lib/language.rb
 - lib/kotodama.rb
-- lib/kotodama.rb~
 - lib/kotodama_grammar.rb
 - README
 - bin/wordgen

data/lib/kotodama.rb~

@@ -1,18 +0,0 @@
-require 'kaiseki'
-
-module Kotodama
-	VERSION = '0.0.7'
-	file_path = File.dirname __FILE__
-	
-	#load base class mods
-	require file_path + '/mod_array'
-	
-	#load basic kotodama classes
-	require file_path + '/language'
-	require file_path + '/type'
-	require file_path + '/rule'
-	require file_path + '/change'
-	
-	#load parser
-	require file_path + '/kotodama_grammar'
-end