EFL 1.0.1 → 1.0.2

data/lib/EFL.rb

@@ -209,13 +209,14 @@ class Generator
 		end #mixGen
 		
 		def replace(source_str, replace_list) #:nodoc:
-			delta_length = 0
+      source_str = "#{source_str} "
+      delta_length = 0
 			result_str = source_str.dup			
 			replace_list.each { |rep|
-        text_without_the_quote_problem = @sub_hash[rep[2]].text.gsub(/"/, '\"')
-				str1 = result_str[0, rep[0] + delta_length]
+        text_without_the_quote_problem = @sub_hash[rep[2]].text.gsub(/"/, '\"')				
+        str1 = result_str[0, rep[0] + delta_length]
 				str2 = result_str[rep[0] + delta_length, rep[1] - rep[0] +1]
-				str3 = result_str[rep[1] + 1 + delta_length, result_str.length - 1]
+				str3 = result_str[rep[1] + 1 + delta_length, result_str.length]
 				str2 =~ @sub_hash[rep[2]].reg_exp.zoom_list.last
         str = ''
         eval("str = " + '"' + text_without_the_quote_problem + '"')
@@ -226,7 +227,7 @@ class Generator
 		end
 		
 		def mix_subs(sub_list, i_file) #:nodoc:
-			result = []
+      result = []
 			sub_list.each { |s|
         begin
           

data/lib/EFL_regexp.rb

@@ -37,7 +37,7 @@ class Regexp
 		
 		op1 = self.dup
   	if op1.minus_list && (op1.minus_list !=[]) then #due '-' has major precedence than '>', this error is detected here
-  		raise "erroooor minus"
+  		raise "error minus"
   	end
 		if op1.zoom_list
 			op1.zoom_list = op1.zoom_list + op2.zoom_list

data/lib/ejemplar.txt

@@ -0,0 +1 @@
+Esto es Eso es

data/lib/pruebaEFL.rb

@@ -0,0 +1,45 @@
+require 'EFL'
+
+class Uno < Generator 
+  def initialize
+    super()
+	#~ gsub(/Estos/, 'ESTO', 's1')
+	#~ sub(/Eso/, 'XXX','s1')
+	
+    before(/Esto/, '-ESTO-', 's1')
+    after(/Eso/, '-ESO-', 's2')
+    gbefore(/es/, '-ES-', 's3')
+
+    prod('ejemplar.txt', 'salida2.txt')
+  end
+end
+
+class Dos < Generator 
+  def initialize
+    super
+    sub(/es/, 'ES', 's1')
+    sub(/una/, 'UNA')
+    prod('ejemplar.txt', 'salida.txt')
+  end
+end
+
+class Tres < Generator 
+  def initialize
+    super
+    sub(/cosa/, 'COSA', 's1')
+    prod('ejemplar.txt', 'salida.txt')
+  end
+end
+
+class Cuatro < Generator 
+  def initialize
+    super
+    sub(/COSA/, 'cosa', 's1')
+#    prod('ejemplar.txt', 'salida.txt')	
+    prod('salida.txt', 'salida.txt')
+  end
+end
+
+(Uno.new).gen
+#~ (Uno.new + Dos.new + Tres.new).gen
+#~ Cuatro.new.gen

data/lib/salida2.txt

@@ -0,0 +1,2 @@
+-ESTO-Esto -ES-es Eso-ESO- -ES-es
+ 

data/tests/Add_Sup_2.rb

@@ -12,12 +12,13 @@ require 'EFL'
 def identicalFiles? (f1, f2)
 	result = false
 	File.open(f1) { |fi1|
-		content01 = fi1.read
+		content1 = fi1.read
 		File.open(f2) { |fi2|
 			content2 = fi2.read
-			result = content01 == content2
+			result = (content1.strip == content2.strip)
 		}		
 	}
+  return result
 end #identicalFiles
 
 class Gen < Test::Unit::TestCase

data/tests/BeforeAfter.rb

@@ -10,12 +10,13 @@ require "EFL"
 def identicalFiles? (f1, f2)
 	result = false
 	File.open(f1) { |fi1|
-		content01 = fi1.read
+		content1 = fi1.read
 		File.open(f2) { |fi2|
 			content2 = fi2.read
-			result = content01 == content2
+			result = (content1.strip == content2.strip)
 		}		
 	}
+  return result
 end #identicalFiles
 
 
@@ -50,7 +51,8 @@ class BeforeAfter < Test::Unit::TestCase
 		(g1+g2+g3).gen
 		assert( identicalFiles?('archAuxiliares/Matriz_3.java', 'archAuxiliares/MatrizOut3.java') )
 	end
-	def test_2
+	
+  def test_2
 		g1 = generator {		
 			reg_exp_str_1 = nested_symbols( '{' , '}' ).to_s
 			reg_exp_str_2 = nested_symbols( '(' , ')' ).to_s			

data/tests/Minus.rb

@@ -10,12 +10,13 @@ require "EFL"
 def identicalFiles? (f1, f2)
 	result = false
 	File.open(f1) { |fi1|
-		content01 = fi1.read
+		content1 = fi1.read
 		File.open(f2) { |fi2|
 			content2 = fi2.read
-			result = content01 == content2
+			result = (content1.strip == content2.strip)
 		}		
 	}
+  return result
 end #identicalFiles
 
 class Minus < Test::Unit::TestCase

data/tests/REVit.rb

@@ -10,12 +10,13 @@ require "EFL"
 def identicalFiles? (f1, f2)
 	result = false
 	File.open(f1) { |fi1|
-		content01 = fi1.read
+		content1 = fi1.read
 		File.open(f2) { |fi2|
 			content2 = fi2.read
-			result = content01 == content2
+			result = (content1.strip == content2.strip)
 		}		
 	}
+  return result
 end #identicalFiles
 
 

data/tests/RenameTest.rb

@@ -13,9 +13,10 @@ def identicalFiles? (f1, f2)
 		content1 = fi1.read
 		File.open(f2) { |fi2|
 			content2 = fi2.read
-			result = content1 == content2
+			result = (content1.strip == content2.strip)
 		}		
 	}
+  return result
 end #identicalFiles
 
 class Rename < Test::Unit::TestCase

data/tests/archAuxiliares/MatrizOut.java

@@ -72,3 +72,4 @@ public class MatrizExterna {
 	} /* multiplicarMatrices */
 
 } /* Matriz */
+ 

data/tests/archAuxiliares/MatrizOut10.java

@@ -66,3 +66,4 @@ public class Matriz {{
 		} /* for i */
 		return matrizResultado;
 	}} /* Matriz */
+ 

data/tests/archAuxiliares/MatrizOut11.java

@@ -84,3 +84,4 @@ public class Matriz {{
 	} /* multiplicarMatrices */
 
 } /* Matriz */
+ 

data/tests/archAuxiliares/MatrizOut2.java

@@ -72,3 +72,4 @@ public class  {
 	} /* multiplicarMatrices */
 
 } /* Matriz */
+ 

data/tests/archAuxiliares/MatrizOut3.java

@@ -72,3 +72,4 @@ public class <<sub_2>><<after_1>> {
 	} /* multiplicarMatrices */
 
 } /* Matriz<<after_1>> */
+ 

data/tests/archAuxiliares/MatrizOut4.java

@@ -72,3 +72,4 @@ public class <<after_1>> {
 	} /* multiplicarMatrices */
 
 } /* Matriz<<after_1>> */
+ 

data/tests/archAuxiliares/MatrizOut5.java

@@ -19,3 +19,4 @@ public class Matriz {
 	
 
 } /* Matriz */
+ 

data/tests/archAuxiliares/MatrizOut6.java

@@ -19,3 +19,4 @@ public class Matriz {
 	
 
 } /* Matriz */
+ 

data/tests/archAuxiliares/MatrizOut7.java

@@ -19,3 +19,4 @@ public class Matriz {
 	
 
 } /* Matriz */
+ 

data/tests/archAuxiliares/MatrizOut8.java

@@ -14,3 +14,4 @@ public class matriz {Matriz
 	
 
 } /* matriz */
+ 

data/tests/archAuxiliares/MatrizOut9.java

@@ -84,3 +84,4 @@ public class Matriz {{
 	} /* multiplicarMatrices */
 
 } /* Matriz */
+ 

data/tests/archAuxiliares/N1_OUT.txt

@@ -16,3 +16,4 @@ perro
 	</b2>
 	perro
 </b1>
+ 

data/tests/archAuxiliares/N2_OUT.txt

@@ -16,3 +16,4 @@ perro
 	</b2>
 	aqui
 </b1>
+ 

data/tests/archAuxiliares/N3_OUT.txt

@@ -20,3 +20,4 @@ perro
 	perro
 	gato
 </b1>
+ 

data/tests/archAuxiliares/N4_OUT.txt

@@ -8,3 +8,4 @@ aquiperroaqui<b2>
 	perro
 	gato
 	</b2>aquiperroaqui
+ 

data/tests/archAuxiliares/N5_OUT.txt

@@ -16,3 +16,4 @@ perro
 	</b2>
 	perro
 </b1>
+ 

data/tests/archAuxiliares/N6_OUT.txt

@@ -16,3 +16,4 @@ perro
 	</b2>
 	aqui
 </b1>
+ 

data/tests/archAuxiliares/minus_out_1.txt

@@ -24,3 +24,4 @@
     </b2>
 
 </b1>
+ 

data/tests/archAuxiliares/p1.txt

@@ -326,3 +326,4 @@ end #AspectGen
 
 
 
+ 

data/tests/archAuxiliares/p2.txt

@@ -326,3 +326,4 @@ end #AspectGen
 
 
 
+ 

data/tests/archAuxiliares/s1.txt

@@ -326,3 +326,4 @@ end #AspectGen
 
 
 
+ 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: EFL
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2008-02-19 00:00:00 +01:00
+  version: 1.0.2
+date: 2009-04-15 00:00:00 +02:00
 summary: A Ruby implementation of the Exemplar Flexibilization Language
 require_paths: 
 - lib
@@ -87,9 +87,12 @@ files:
 - lib/EFL_regexp_generator.rb
 - lib/EFL_substitution.rb
 - lib/EFL_syntactic_sugar.rb
+- lib/ejemplar.txt
 - lib/Hash Doc.doc
 - lib/lib.zip
 - lib/Limitaciones.txt
+- lib/pruebaEFL.rb
+- lib/salida2.txt
 - tests/Add_Sup_1.rb
 - tests/Add_Sup_1.rb.bak
 - tests/Add_Sup_1_NI.rb