trenni 3.0.3 → 3.0.4

data/lib/trenni/fallback/markup.rb

@@ -553,7 +553,7 @@ module Trenni
 								raise ParseError.new("could not parse tag", buffer, p)
 							end
 						when 18 then
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -621,7 +621,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -649,7 +649,7 @@ module Trenni
 								characters_end = p
 																pcdata << data.byteslice(characters_begin...characters_end)
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -668,7 +668,7 @@ module Trenni
 																has_entities = true
 								pcdata << entities[name]
 							end
-							# line 8 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 8 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									top -= 1
@@ -685,7 +685,7 @@ module Trenni
 																has_entities = true
 								pcdata << data.byteslice(entity_begin...entity_end).to_i(16)
 							end
-							# line 8 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 8 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									top -= 1
@@ -702,7 +702,7 @@ module Trenni
 																has_entities = true
 								pcdata << data.byteslice(entity_begin...entity_end).to_i(10)
 							end
-							# line 8 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 8 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									top -= 1
@@ -823,7 +823,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -916,7 +916,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -965,7 +965,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -1012,7 +1012,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -1059,7 +1059,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -1106,7 +1106,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -1155,7 +1155,7 @@ module Trenni
 								pcdata = ""
 								has_entities = false
 							end
-							# line 10 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
+							# line 10 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/entities.rl"
 							begin
 								begin
 									stack[top] = cs

data/lib/trenni/fallback/template.rb

@@ -51,8 +51,8 @@ module Trenni
 			125, 35, 125, 34, 123, 
 			34, 123, 39, 39, 34, 125, 
 			9, 60, 10, 60, 10, 
-			60, 9, 60, 9, 32, 
-			0, 0, 34, 39, 34, 35, 
+			60, 9, 60, 0, 0, 
+			9, 32, 34, 39, 34, 35, 
 			39, 39, 0, 0, 34, 
 			39, 34, 35, 39, 39, 
 			0, 0, 0
@@ -68,8 +68,8 @@ module Trenni
 			1, 1, 128, 1, 1, 92, 2, 91, 
 			91, 6, 91, 91, 90, 90, 1, 92, 
 			92, 2, 91, 91, 6, 91, 91, 90, 
-			90, 1, 92, 52, 51, 51, 52, 24, 
-			0, 6, 2, 1, 0, 6, 2, 1, 
+			90, 1, 92, 52, 51, 51, 52, 0, 
+			24, 6, 2, 1, 0, 6, 2, 1, 
 			0
 		]
 
@@ -84,7 +84,7 @@ module Trenni
 			705, 797, 804, 896, 988, 1079, 1170, 1172, 
 			1265, 1358, 1361, 1453, 1545, 1552, 1644, 1736, 
 			1827, 1918, 1920, 2013, 2066, 2118, 2170, 2223, 
-			2248, 2249, 2256, 2259, 2261, 2262, 2269, 2272, 
+			2224, 2249, 2256, 2259, 2261, 2262, 2269, 2272, 
 			2274
 		]
 
@@ -370,14 +370,14 @@ module Trenni
 			6, 74, 6, 6, 78, 6, 6, 6, 
 			6, 6, 6, 6, 6, 6, 6, 6, 
 			6, 6, 6, 6, 6, 6, 6, 6, 
-			6, 6, 6, 6, 6, 81, 6, 13, 
-			15, 13, 13, 13, 14, 14, 14, 14, 
-			14, 14, 14, 14, 14, 14, 14, 14, 
-			14, 14, 14, 14, 14, 14, 13, 14, 
-			82, 40, 41, 36, 36, 36, 40, 36, 
-			33, 34, 29, 48, 30, 83, 63, 64, 
+			6, 6, 6, 6, 6, 81, 6, 82, 
+			13, 15, 13, 13, 13, 83, 83, 83, 
+			83, 83, 83, 83, 83, 83, 83, 83, 
+			83, 83, 83, 83, 83, 83, 83, 13, 
+			83, 40, 41, 36, 36, 36, 40, 36, 
+			33, 34, 29, 48, 30, 84, 63, 64, 
 			59, 59, 59, 63, 59, 56, 57, 52, 
-			71, 53, 83, 0
+			71, 53, 84, 0
 		]
 
 		class << self
@@ -386,16 +386,16 @@ module Trenni
 		end
 		self._template_trans_targs = [
 			43, 1, 45, 2, 3, 43, 44, 7, 
-			8, 43, 9, 9, 10, 11, 43, 47, 
-			48, 14, 15, 0, 18, 16, 17, 43, 
-			19, 19, 20, 47, 21, 22, 30, 21, 
+			8, 43, 9, 9, 10, 11, 43, 43, 
+			47, 14, 15, 0, 18, 16, 17, 43, 
+			19, 19, 20, 48, 21, 22, 30, 21, 
 			52, 23, 29, 24, 25, 23, 50, 23, 
 			26, 28, 27, 26, 49, 26, 25, 22, 
 			31, 31, 51, 32, 33, 41, 32, 56, 
 			34, 40, 35, 36, 34, 54, 34, 37, 
 			39, 38, 37, 53, 37, 36, 33, 42, 
 			42, 55, 46, 12, 13, 43, 4, 5, 
-			43, 6, 43, 0
+			43, 6, 43, 43, 0
 		]
 
 		class << self
@@ -413,7 +413,7 @@ module Trenni
 			0, 0, 0, 0, 13, 18, 15, 0, 
 			0, 0, 13, 18, 15, 16, 16, 0, 
 			13, 18, 20, 0, 0, 21, 0, 0, 
-			22, 0, 23, 0
+			22, 0, 23, 24, 0
 		]
 
 		class << self
@@ -471,8 +471,8 @@ module Trenni
 			0, 0, 0, 0, 0, 0, 0, 0, 
 			0, 0, 0, 0, 0, 0, 0, 0, 
 			0, 0, 0, 0, 0, 0, 0, 0, 
-			0, 0, 0, 0, 78, 81, 78, 15, 
-			83, 0, 0, 0, 0, 0, 0, 0, 
+			0, 0, 0, 0, 78, 81, 78, 83, 
+			84, 0, 0, 0, 0, 0, 0, 0, 
 			0
 		]
 
@@ -590,7 +590,7 @@ module Trenni
 								raise ParseError.new("failed to parse instruction", buffer, p)
 							end
 						when 16 then
-							# line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+							# line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -601,7 +601,7 @@ module Trenni
 								end
 							end
 						when 13 then
-							# line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+							# line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 							begin
 								begin
 									stack[top] = cs
@@ -612,7 +612,7 @@ module Trenni
 								end
 							end
 						when 14 then
-							# line 20 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+							# line 20 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 							begin
 								begin
 									top -= 1
@@ -626,6 +626,14 @@ module Trenni
 							begin
 								te = p+1
 							end
+						when 8 then
+							# line 36 "template.rl"
+							begin
+								te = p+1
+								begin 
+									delegate.instruction(data.byteslice(instruction_begin...instruction_end), "\n")
+								end
+							end
 						when 10 then
 							# line 60 "template.rl"
 							begin
@@ -642,39 +650,42 @@ module Trenni
 								delegate.text(data.byteslice(ts...te))
 							end
 						end
-					when 21 then
-						# line 60 "template.rl"
+					when 24 then
+						# line 32 "template.rl"
 						begin
 							te = p
 							p = p - 1; begin 
-							delegate.text(data.byteslice(ts...te))
+							delegate.instruction(data.byteslice(instruction_begin...instruction_end))
 						end
 					end
-				when 1 then
+				when 21 then
 					# line 60 "template.rl"
 					begin
-						begin p = ((te))-1; end
-						begin 
-							delegate.text(data.byteslice(ts...te))
-						end
+						te = p
+						p = p - 1; begin 
+						delegate.text(data.byteslice(ts...te))
 					end
-				when 3 then
-					# line 60 "template.rl"
-					begin
-						begin p = ((te))-1; end
-						begin 
-							delegate.text(data.byteslice(ts...te))
-						end
+				end
+			when 1 then
+				# line 60 "template.rl"
+				begin
+					begin p = ((te))-1; end
+					begin 
+						delegate.text(data.byteslice(ts...te))
 					end
-				when 7 then
-					# line 1 "NONE"
-					begin
-						case act
-						when 1 then
-							begin begin p = ((te))-1; end
-
-							delegate.instruction(data.byteslice(instruction_begin...instruction_end), "\n")
-						end
+				end
+			when 3 then
+				# line 60 "template.rl"
+				begin
+					begin p = ((te))-1; end
+					begin 
+						delegate.text(data.byteslice(ts...te))
+					end
+				end
+			when 7 then
+				# line 1 "NONE"
+				begin
+					case act
 					when 3 then
 						begin begin p = ((te))-1; end
 
@@ -706,13 +717,13 @@ module Trenni
 
 			expression_begin = p
 		end
-		# line 53 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+		# line 53 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 		begin
 			te = p
 		p = p - 1; begin cs = 32; end
 	end
 when 15 then
-	# line 13 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+	# line 13 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	begin
 		begin
 			stack[top] = cs
@@ -722,7 +733,7 @@ when 15 then
 			next
 		end
 	end
-	# line 17 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+	# line 17 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	begin
 		begin
 			stack[top] = cs
@@ -732,14 +743,6 @@ when 15 then
 			next
 		end
 	end
-when 8 then
-	# line 1 "NONE"
-	begin
-		te = p+1
-	end
-	# line 36 "template.rl"
-	begin
-	act = 1;		end
 when 11 then
 	# line 1 "NONE"
 	begin
@@ -767,10 +770,10 @@ when 18 then
 
 		delegate.expression(data.byteslice(expression_begin...expression_end))
 	end
-	# line 21 "/home/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
+	# line 21 "/Users/samuel/Documents/Programming/ioquatix/trenni/parsers/trenni/template.rl"
 	begin
 	cs = 43;		end
-	# line 781 "template.rb"
+	# line 784 "template.rb"
 end
 end
 end
@@ -780,7 +783,7 @@ if _goto_level <= _again
 		# line 1 "NONE"
 		begin
 		ts = nil;		end
-		# line 791 "template.rb"
+		# line 794 "template.rb"
 	end
 
 	if cs == 0
@@ -813,7 +816,7 @@ if _goto_level <= _test_eof
 
 				raise ParseError.new("failed to parse expression", buffer, p)
 			end
-			# line 824 "template.rb"
+			# line 827 "template.rb"
 		end
 	end
 

data/lib/trenni/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Trenni
-	VERSION = "3.0.3"
+	VERSION = "3.0.4"
 end

data/parsers/trenni/template.rl

@@ -33,7 +33,7 @@
 		(space+ (any - [?] | '?' [^>])*) >instruction_begin %instruction_end
 		'?>') @err(instruction_error);
 	
-	instruction_line = (space - newline)* instruction space* newline;
+	instruction_line = (space - newline)* instruction (space - newline)* newline;
 	
 	other_instruction = '<?' (
 		(identifier - 'r') space+ (any - [?] | '?' [^>])* '?>'

data/spec/trenni/template_spec.rb

@@ -35,6 +35,17 @@ RSpec.describe Trenni::Template do
 	end
 end
 
+RSpec.describe Trenni::Template do
+	let(:template_path) {File.expand_path('template_spec/lines.trenni', __dir__)}
+	let(:template) {Trenni::Template.load_file template_path}
+	let(:code) {template.send(:code)}
+	
+	it "should parse xhtml template and produce identical output" do
+		expect(code.lines[0]).to match(/apple/)
+		expect(code.lines[5]).to match(/banana/)
+	end
+end
+
 RSpec.describe Trenni::Template do
 	let(:capture_template) {Trenni::Template.load_file File.expand_path('template_spec/capture.trenni', __dir__)}
 	

data/spec/trenni/template_spec/lines.trenni

@@ -0,0 +1,6 @@
+apples
+
+<?r x = 10
+?>
+
+bananas

data/tasks/parsers.rake

@@ -1,7 +1,8 @@
 
-PARSERS_DIRECTORY = File.expand_path("parsers", __dir__)
-FALLBACK_DIRECTORY = File.expand_path("lib/trenni/fallback", __dir__)
-NATIVE_DIRECTORY = File.expand_path("ext/trenni", __dir__)
+PARSERS_DIRECTORY = File.expand_path("../parsers", __dir__)
+FALLBACK_DIRECTORY = File.expand_path("../lib/trenni/fallback", __dir__)
+EXTENSIONS_DIRECTORY = File.expand_path("../ext", __dir__)
+NATIVE_DIRECTORY = File.expand_path("../ext/trenni", __dir__)
 
 task :generate_fallback_parsers do
 	Dir.chdir(FALLBACK_DIRECTORY) do
@@ -21,6 +22,10 @@ task :generate_native_parsers do
 	end
 end
 
+task :compile do
+	system("rake", "compile", chdir: EXTENSIONS_DIRECTORY)
+end
+
 task :generate_parsers => [:generate_native_parsers, :generate_fallback_parsers, :compile]
 
 task :visualize_parsers do

metadata

@@ -1,75 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: trenni
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Samuel Williams
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake-compiler
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "\tTrenni is a templating system built on top of SGML/XML. It uses efficient\n\
-  \tnative parsers where possible and compiles templates into efficient Ruby.\n\t\n\
-  \tIn addition, Trenni includes an SGML/XML builder to assist with the generation\n\
-  \tof pleasantly formatted markup which is compatible with the included parsers.\n"
+description: "\tTrenni is a templating system built on top of SGML/XML. It uses efficient\n\tnative
+  parsers where possible and compiles templates into efficient Ruby.\n\t\n\tIn addition,
+  Trenni includes an SGML/XML builder to assist with the generation\n\tof pleasantly
+  formatted markup which is compatible with the included parsers.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables: []
@@ -143,6 +143,7 @@ files:
 - spec/trenni/template_spec/escaped.trenni
 - spec/trenni/template_spec/interpolations.trenni
 - spec/trenni/template_spec/large.trenni
+- spec/trenni/template_spec/lines.trenni
 - spec/trenni/template_spec/nested.trenni
 - tasks/entities.rake
 - tasks/parsers.rake
@@ -150,7 +151,7 @@ files:
 homepage: https://github.com/ioquatix/trenni
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -165,9 +166,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.10
+signing_key: 
 specification_version: 4
 summary: A fast native templating system that compiles directly to Ruby code.
 test_files:
@@ -191,4 +192,5 @@ test_files:
 - spec/trenni/template_spec/escaped.trenni
 - spec/trenni/template_spec/interpolations.trenni
 - spec/trenni/template_spec/large.trenni
+- spec/trenni/template_spec/lines.trenni
 - spec/trenni/template_spec/nested.trenni