shift-lang 0.1.1 → 0.1.2

data/lib/shift-lang/builder.rb

@@ -42,9 +42,17 @@ module Shift
 						case this_statement
 
 						when :model_definition_statement
+							if num_tabs != 0
+								@clean = false
+								puts "Error at line #{line_number} character 1 : #{line}"
+							end
 							model = Builder::DBModel.new(statement[:model_definition_statement][:model_name])
 
 						when :model_attribute_definition_statement
+							if num_tabs != 1
+								@clean = false
+								puts "Error at line #{line_number} character 1 : #{line}"
+							end
 							model_attribute = statement[:model_attribute_definition_statement]
 							model.add_attribute(model_attribute[:attribute_name], model_attribute[:attribute_type])
 
@@ -53,14 +61,28 @@ module Shift
 								add_model model
 							end
 
+							if num_tabs != 0
+								@clean = false
+								puts "Error at line #{line_number} character 1 : #{line}"
+							end
+
 							url = statement[:url]
 						when :url_method
 							if url_handler
 								add_handler url_handler
 							end
 
+							if num_tabs != 1
+								@clean = false
+								puts "Error at line #{line_number} character 1 : #{line}"
+							end
+
 							url_handler = Builder::UrlHandler.new(url, statement[:url_method].to_s)
 						else
+							if num_tabs < 2
+								@clean = false
+								puts "Error at line #{line_number} character 1 : #{line}"
+							end
 							stmt = {
 								:statement => statement, 
 								:num_tabs => num_tabs

data/lib/shift-lang/generator/javascript_generator.rb

@@ -213,8 +213,16 @@ module Shift
 					case statement[:condition][:operator].to_s.gsub!(" ", "")
 					when "<="
 						condition_expression = "{lte : " + condition_attribute + "}"
+					when ">="
+						condition_expression = "{gte : " + condition_attribute + "}"
+					when "<"
+						condition_expression = "{lt : " + condition_attribute + "}"
+					when ">"
+						condition_expression = "{gt : " + condition_attribute + "}"
+					when "!="
+						condition_expression = "{not : " + condition_attribute + "}"						
 					else
-						puts statement[:operator].to_s.gsub!(" ", "")
+						condition_expression = condition_attribute
 					end
 					
 					result += "{ " + condition[:attribute] + " : " + condition_expression + " }"
@@ -377,7 +385,7 @@ module Shift
 					url_handler_template = ERB.new(Shift::Generator::JavaScriptTemplates::URL_HANDLER_DEFINITION)
 					result += "\n" + url_handler_template.result(binding) + "\n"
 
-					defined_hashes = []
+					@defined_hashes = []
 
 					handlers.handler.each do | statement |
 						result += apply_transforms(statement[:statement], statement[:num_tabs] + functions.length) 

data/lib/shift-lang/generator/ruby_generator.rb

@@ -310,7 +310,7 @@ module Shift
 				result = get_import_statements + get_model_data + get_utility_functions
 
 				@builder.handlers.each do | handlers |
-					defined_hashes = []
+					@defined_hashes = []
 
 					result += handlers.method + " '" + url_transform(handlers.url) + "' do\n"
 

data/lib/shift-lang/parser/keyword_parser.rb

@@ -48,5 +48,14 @@ module Shift
 
 		rule(:integer_cast_keyword) { str('int') }
 	
+		rule(:keyword) { 
+						read_keyword | write_keyword | write_file_keyword | redirect_keyword |
+						all_keyword | new_keyword | find_keyword | where_keyword | find_by_id_keyword | update_keyword | delete_keyword | 
+						if_keyword | else_keyword | for_keyword | in_keyword | while_keyword |
+						get_keyword | post_keyword |
+						model_keyword | string_keyword | integer_keyword | 
+						integer_cast_keyword 
+					}
+
 	end
 end 

data/lib/shift-lang/parser/routing_expression_parser.rb

@@ -6,9 +6,9 @@ module Shift
 
 		rule(:url_method) { get_keyword.as(:url_method) | post_keyword.as(:url_method) }
 
-		rule(:url_variable) { colon >> identifier.as(:url_variable) }
+		rule(:url_variable) { colon >> (identifier.as(:url_variable) | keyword.as(:url_variable)) }
 
-		rule(:url_token) { (url_variable | identifier.as(:url_token)) >> fwd_slash.maybe }
+		rule(:url_token) { (url_variable | (identifier.as(:url_token) | keyword.as(:url_variable))) >> fwd_slash.maybe }
 
 		rule(:url) { fwd_slash >> url_token.repeat(0) }
 

data/lib/shift-lang/parser/token_parser.rb

@@ -47,12 +47,12 @@ module Shift
 	  	end
 		rule(:string_value) { single_quoted_string | double_quoted_string }
 
-		rule(:identifier) { match('[A-Za-z]') >> match['[A-Za-z0-9_]'].repeat(0) }
+		rule(:identifier) { keyword.absent? >> match('[A-Za-z]') >> match['[A-Za-z0-9_]'].repeat(0) }
 
 		rule(:hash_attribute) { string_value | identifier }
-		rule(:hash_value) { identifier >> left_square_bracket >> hash_attribute >> right_square_bracket }
+		rule(:hash_value) { keyword.absent? >> identifier >> left_square_bracket >> hash_attribute >> right_square_bracket }
 
-		rule(:object_value) { identifier >> dot >> identifier }
+		rule(:object_value) { keyword.absent? >> identifier >> dot >> keyword.absent? >> identifier }
 
 		rule(:variables) { space? >> (object_value.as(:object_value) | hash_value.as(:hash_value) | identifier.as(:identifier)) >> space? }
 

data/lib/shift-lang/version.rb

@@ -1,3 +1,3 @@
 module Shift
-	VERSION = "0.1.1"
+	VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shift-lang
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: