lokar 0.1.0 → 0.2.0

data/lokar.rb

@@ -2,133 +2,149 @@ require 'strscan'
 
 module Lokar
 	def self.render(string, filename = '<Lokar>', binding = nil)
-		output = ["__output__ = []", *parse(string, filename), "\n__output__"]
-		
-		eval(output.join, binding, filename).join
+		eval("__output__ = []#{parse(string, filename).join}; __output__", binding, filename).join
 	end
 	
 	def self.compile(string, filename = '<Lokar>', binding = nil)
-		output = ["Proc.new do __output__ = []", *parse(string, filename), "\n__output__ end"]
-		
-		eval output.join, binding, filename
+		eval "Proc.new do __output__ = []#{parse(string, filename).join}; __output__ end", binding, filename
 	end
 	
 	def self.parse(string, filename)
 		scanner = StringScanner.new(string)
-		output = []
 		prev_text = false
 		prev_output = true
+		output = []
+		line = 1
+		flushed = 1
 		
 		while true
-			match = scanner.scan_until(/(?=<\?r[ \t]|\#{|^[ \t]*%)/m)
+			match = scanner.scan_until(/(?=<\?r(?:[ \t]|$)|\#?\#{|^[ \t]*%|(?:\r\n?|\n))/m)
 			if match
 				# Add the text before the match
-				if prev_text
-					output.insert(-1, match.inspect)
-				else
+				unless prev_text
 					if prev_output
-						output << " << "
+						output << "<<"
 					else
-						output << "\n__output__ << "
+						output << ";__output__<<"
 						prev_output = true
 					end
-					output << match.inspect
 					prev_text = true
 				end
+				output << match.inspect
 				
 				case # Find out what of the regular expression matched
-					when scanner.match?(/</) # Parse <?r ?> tags
+					when match = scanner.scan(/\r\n?|\n/) # Parse newlines
+						unless prev_text
+							if prev_output
+								output << "<<"
+							else
+								output << ";__output__<<"
+								prev_output = true
+							end
+							prev_text = true
+						end
+						output << match.inspect
+						line += 1
+						
+					when scanner.match?(/</) # Parse <?r?> tags
 						scanner.pos += 3
 						result = scanner.scan_until(/(?=\?>)/m)
-						raise "#{filename}: Unterminated <?r ?> tag" unless result
-						
-						output << "\n"
-						output << result
+						raise "#{filename}:#{line}: Unterminated <\?r ?> tag" unless result
 						
+						output << ("\n" * (line - flushed)) << ";" << result
+						flushed = line
 						prev_text = false
 						prev_output = false
 						
 						scanner.pos += 2
 					
-					when scanner.match?(/\#/) # Parse #{ } tags
-						index = 1
-						scanner.pos += 2
-						
-						if prev_output
-							output << " << ("
+					when scanner.skip(/\#/) # Parse #{ } tags
+						if scanner.skip(/\#/)
+							unless prev_text
+								if prev_output
+									output << "<<"
+								else
+									output << ";__output__<<"
+									prev_output = true
+								end
+								prev_text = true
+							end
+							output << '#'.inspect
 						else
-							output << "\n__output__ << ("
-							prev_output = true
-						end
-						
-						while true
-							result = scanner.scan_until(/(?=}|{)/m)
-							raise "#{filename}: Unterminated \#{ } tag" unless result
-							output << result
-							case 
-								when scanner.scan(/{/)
-									index += 1
-									output << '{'
-									
-								when scanner.scan(/}/)
-									index -= 1
-									break if index == 0
-									output << '}'
+							index = 1
+							scanner.pos += 1
+							
+							if prev_output
+								output << "<<" << ("\n" * (line - flushed)) << "("
+							else
+								output << ("\n" * (line - flushed)) << ";__output__<<("
+								prev_output = true
+							end
+							flushed = line
+							prev_text = false
+							
+							while true
+								result = scanner.scan_until(/(?=}|{)/m)
+								raise "#{filename}:#{line}: Unterminated \#\{ } tag" unless result
+								output << result
+								case
+									when scanner.skip(/{/)
+										index += 1
+										output << '{'
+										
+									when scanner.skip(/}/)
+										index -= 1
+										break if index == 0
+										output << '}'
+								end
 							end
+							
+							output << ")"
 						end
-						
-						output << ")"
-						
-						prev_output = true
-						prev_text = false
 					
 					else # Parse %, %% and %= lines
 						result = scanner.scan(/[ \t]*%/)
-						if scanner.scan(/%/)
-							result = result.inspect
-							if prev_text
-								output << result
-							else
+						if scanner.skip(/%/)
+							unless prev_text
 								if prev_output
-									output << " << "
+									output << "<<"
 								else
-									output << "\n__output__ << "
+									output << ";__output__<<"
 									prev_output = true
 								end
-								output << result
 								prev_text = true
 							end
-						else
-							if scanner.scan(/=/)
-								if prev_output
-									output << " << ("
-								else
-									output << "\n__output__ << ("
-									prev_output = true
-								end
-								output << scanner.scan_until(/(\r\n|\n|\Z)/) 
-								output << ")"
+							output << result.inspect
+						elsif scanner.skip(/=/)
+							if prev_output
+								output << "<<" << ("\n" * (line - flushed)) << "("
 							else
-								output << "\n"
-								output << scanner.scan_until(/(\r\n|\n|\Z)/)
-								prev_output = false
+								output << ("\n" * (line - flushed)) << ";__output__<<("
+								prev_output = true
 							end
+							flushed = line
+							prev_text = false
+							output << scanner.scan_until(/(?=\r\n|\n|\Z)/) << ")"
+						else
+							output << ("\n" * (line - flushed)) << ";" << scanner.scan_until(/\r\n|\n|\Z/)
+							flushed = line
 							prev_text = false
+							prev_output = false
 						end
 				end
 			else # End of file
 				unless scanner.eos?
 					# Add the pending text
-					if prev_text
-						output << scanner.rest.inspect
-					else
+					unless prev_text
 						if prev_output
-							output << " << "
+							output << "<<"
 						else
-							output << "\n__output__ << "
+							output << ";__output__<<"
+							prev_output = true
 						end
-						output << scanner.rest.inspect
+						prev_text = true
 					end
+					output << scanner.rest.inspect
 				end
 				break
 			end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: lokar
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Zoxc
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +01:00
+date: 2010-09-20 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -34,21 +39,27 @@ rdoc_options: []
 require_paths: 
 - .
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 9
+      - 0
       version: 1.9.0
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Lokar is a simple fast template engine.