sweet-lang 0.1.0 → 0.1.9

data/lib/lexer/strings.rb

@@ -1,13 +1,35 @@
 class Strings
 
-	def convert_string(code)
-		strings = code.scan(/\t(\"[a-zA-Z0-9].*\")/)
+	def convert_string(code, indent)
+		strings = code.scan(/\t("[^"]+")/m)
 		strings.uniq!
 		strings.each do |string|
-			new_string = "print(#{string[0]})"
+			original_tabs = code.scan(/((\t)+)#{string[0]}/)
+			original_tabs = (!original_tabs[0].nil?) ? original_tabs[0][0].count("\t") : 1
+			n_string = string[0].gsub( "<"," &lt;" ).gsub( ">"," &gt;" )
+			n_string = n_string.gsub(/\n/, "<br />")
+			n_string = n_string.gsub("=", "\\=")
+			get_tabs = n_string.scan(/((\t)+)/)
+			get_tabs.each do |line|
+				actual_tab = line[0].count("\t")
+				if actual_tab <= original_tabs
+					n_string = n_string.sub(/(\t)+/, "#{ '&nbsp;&nbsp;' * actual_tab }")
+				else
+					n_string = n_string.sub(/(\t)+/, "#{ '&nbsp;&nbsp;' * (actual_tab - original_tabs) }")
+				end
+			end
+			new_string = "print(#{n_string})"
 			code = code.gsub(string[0], new_string)
 		end
 		return code
 	end
 
+	def fix_atr(code, indent)
+		strings = code.scan(/print\(.*\)/m)
+		strings.uniq!
+		n_string = strings[0].gsub("\\=", "=")
+		code = code.gsub(strings[0], n_string)
+		return code
+	end
+
 end

data/lib/lexer/tags.rb

@@ -41,11 +41,16 @@ class Tags
 		atr.map {|x| x[0] + "'#{x[1]}'" }
 	end
 
-	def adding_attributes(code, tag)
+	def adding_attributes(code, tag, inline=false)
 		_attr = [ [ "id", "#" ], [ "class", "\\." ] ]
 		_attr.each do |a|
-			orig = code.scan(/#{tag} ([.a-zA-Z0-9=-_ ]+)?(#{a[1]}([a-zA-Z0-9]+))/)
-			orig.map! {|x| [x[1], x[2]] }
+			if inline
+				orig = code.scan(/^(\t)+?#{tag}([.a-zA-Z0-9=-_ ]+)? (#{a[1]}([a-zA-Z0-9_\-]+))/)
+				orig.map! {|x| [x[2], x[3]] }
+			else
+				orig = code.scan(/^#{tag}([.a-zA-Z0-9=-_ ]+)? (#{a[1]}([a-zA-Z0-9_\-]+))/)
+				orig.map! {|x| [x[1], x[2]] }
+			end
 			orig.uniq!
 			orig.each do |_old|
 				_new = "#{a[0]}=#{_old[1]}"
@@ -57,29 +62,29 @@ class Tags
 
 	def implement_tag(code, indent=1)
 		new_code = []
+		@strings = Strings.new
 		@@inline_tags.each do |tag|
-			general = code.scan(/(^(\t)+?(#{tag}(()$| )([ #.=_\-a-zA-Z0-9]+)?((\n\t.*)+)?).*)/)
+			general = code.scan(/(^(\t)+?(#{tag}(()$| )([ #.=_\-a-zA-Z0-9:\/\?\+,]+)?))/)
 			general.map! {|x| x[0]}
 			general.each_with_index do |block, index|
-				new_indent = general[0].split("\t").count
+				new_indent = block.scan(/((\t)+)[^\t]/)[0][0].count("\t") + 1
 				_code_block = block
-				code_block = adding_attributes(block, tag)
-				strings = Strings.new
-				code_block = strings.convert_string( code_block )
-				atr = code_block.scan(/([a-zA-Z0-9_-]+=)'?"?([a-zA-Z0-9_-]+)'?"?/)
+				code_block = adding_attributes(block, tag, true)
+				atr = code_block.scan(/([a-zA-Z0-9_-]+=)'?"?([\.\/:a-zA-Z0-9_-]+)'?"?/)		
 				code_block = convert_tag( code_block , index, new_indent, tag, atr, true)
 				code = code.gsub(_code_block, code_block)
 			end
 		end
 		@@tags.each do |tag|
-			general = code.scan(/(^(#{tag}(()$| )([ #.=_\-a-zA-Z0-9]+)?((\n\t.*)+)?).*)/)
+			general = code.scan(/(^(#{tag}(()$| )([ :\/\?\+#.=_\-a-zA-Z0-9]+)?((\n\t.*)+)?).*)/m)
 			general.map! {|x| x[0]}
 			general.each_with_index do |block, index|
 				_code_block = block
 				code_block = adding_attributes(block, tag)
+				code_block = @strings.convert_string( code_block, indent )
 				@@tags.each do |r_tag|
-					if !code_block.scan(/^(\t){#{indent}}(#{r_tag}(()$| )([a-zA-Z0-9= \t_\-#.\\'\/]+)?((\n\1{#{indent+1},})?(["#a= ()a-zA-Z0-9_.-\\'\/]+)?)+)/m).empty?
-						r_code = code_block.scan(/^(\t){#{indent}}(#{r_tag}(()$| )([a-zA-Z0-9= \t_\-#.\\'\/]+)?((\n\1{#{indent+1},})?(["#a= ()a-zA-Z0-9_.-\\'\/]+)?)+)/m)
+					if !code_block.scan(/^(\t){#{indent}}(#{r_tag}(()$| )((\n)+?[a-zA-Z0-9= \t_\-#.\\'\/]+)?(((\n)+?\1{#{indent+1},})?(["#a= ()a-zA-Z0-9_.,\--\\'\/&]+)?)+)/m).empty?
+						r_code = code_block.scan(/^(\t){#{indent}}(#{r_tag}(()$| )((\n)+?[a-zA-Z0-9= \t_\-#.\\'\/]+)?(((\n)+?\1{#{indent+1},})?(["#a= ()a-zA-Z0-9_.,\--\\'\/&]+)?)+)/m)
 						r_code.each do |r|
 							new_indent = indent + 1
 							new_block = implement_tag(r[1], new_indent)
@@ -87,13 +92,12 @@ class Tags
 						end
 					end
 				end
-				strings = Strings.new
-				code_block = strings.convert_string( code_block )
-				atr = code_block.scan(/([a-zA-Z0-9_-]+=)([a-zA-Z0-9_-]+)/)
+				atr = code_block.scan(/([a-zA-Z0-9_-]+=)([\.\/:a-zA-Z0-9_-]+)/)
 				code_block = convert_tag( code_block , index, indent, tag, atr)
 				code = code.gsub(_code_block, code_block)
 			end
 		end
+		code = @strings.fix_atr( code, indent )
 		return code
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sweet-lang
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ files:
 - lib/runtime/method.rb
 - lib/runtime/object.rb
 - bin/sweet
-homepage: https://github.com/joaomdmoura/sweet
+homepage: http://joaomdmoura.github.com/sweet/
 licenses: []
 post_install_message: 
 rdoc_options: []