rubyscript 0.0.5 → 0.0.6

data/lib/rubyscript/convert.rb

@@ -19,6 +19,21 @@ module RubyScript
 			convert_anon(parsed)
 		end
 		
+		###
+		## Scopes and Blocks
+		###
+		def convert_scope scope
+			convert_anon(scope[1])
+		end
+		
+		def convert_block block
+			body = convert_anon(block[1])
+			"#{body};\n"
+		end
+		
+		###
+		## Functions
+		###
 		def convert_defn defn
 			func_name = defn[1]
 			func_args = convert_args(defn[2])
@@ -34,15 +49,6 @@ module RubyScript
 			args.join(", ")
 		end
 		
-		def convert_scope scope
-			convert_anon(scope[1])
-		end
-		
-		def convert_block block
-			body = convert_anon(block[1])
-			"#{body};\n"
-		end
-		
 		def convert_call call
 			call_name = call[2]
 			call_args = convert_arglist(call[3])
@@ -62,7 +68,9 @@ module RubyScript
 			args
 		end
 		
-		# Data types
+		###
+		## Data types
+		###
 		def convert_nil nil_arg
 			"null"
 		end
@@ -73,20 +81,20 @@ module RubyScript
 		
 		def convert_dstr dstr
 			dstr.delete_at(0)
-			string = "\"#{dstr[0]}"
+			string = ""
 			dstr.delete_at(0)
-			dstr.each do |str|
-				if (str[0] == :str)
-					string << "#{str[1]}"
+			dstr.each_index do |i|
+				if i == (dstr.count - 1)
+					string << convert_anon(dstr[i])
 				else
-					string << convert_anon(str)
+					string << "#{convert_anon(dstr[i])} + "
 				end
 			end
-			"#{string}\""
+			string
 		end
 		
 		def convert_evstr evstr
-			"\" + #{convert_anon(evstr[1])} + \""
+			"(#{convert_anon(evstr[1])})"
 		end
 		
 		def convert_lvar lvar

data/lib/rubyscript/version.rb

@@ -1,3 +1,3 @@
 module RubyScript
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -2,7 +2,7 @@
 name: rubyscript
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - James Birtles