EFL 1.0 → 1.0.1

data/lib/EFL.rb

@@ -212,12 +212,13 @@ class Generator
 			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]
 				str2 = result_str[rep[0] + delta_length, rep[1] - rep[0] +1]
 				str3 = result_str[rep[1] + 1 + delta_length, result_str.length - 1]
 				str2 =~ @sub_hash[rep[2]].reg_exp.zoom_list.last
- 			str = ''
-				eval("str = " + '"' + @sub_hash[rep[2]].text + '"')		
+        str = ''
+        eval("str = " + '"' + text_without_the_quote_problem + '"')
 				result_str = str1 + str + str3
 				delta_length = result_str.length - source_str.length
 			}
@@ -227,47 +228,54 @@ class Generator
 		def mix_subs(sub_list, i_file) #:nodoc:
 			result = []
 			sub_list.each { |s|
-				# local substitutions
-				if /local/ =~ @sub_hash[s].scope then
-					if /before/ =~ @sub_hash[s].scope then
-						element = @sub_hash[s].match_hash[i_file][0].dup
-						element[1] = element[0] - 1
-						element << s
-						result << element
-					elsif /after/ =~ @sub_hash[s].scope then
-						element = @sub_hash[s].match_hash[i_file][0].dup
-						element[0] = element[1] + 1
-						element << s
-						result << element
-					else
-						element = @sub_hash[s].match_hash[i_file][0].dup
-						element << s
-						result << element
-					end
-				# global substitutions
-				else
-					if /before/ =~ @sub_hash[s].scope then
-						@sub_hash[s].match_hash[i_file].each { |m|
-							element = m.dup
-							element[1] = element[0] - 1
-							element << s
-							result << element
-						}
-					elsif /after/ =~ @sub_hash[s].scope then
-						@sub_hash[s].match_hash[i_file].each { |m|
-							element = m.dup
-							element[0] = element[1] + 1
-							element << s
-							result << element
-						}
-					else
-						@sub_hash[s].match_hash[i_file].each { |m|
-							element = m.dup
-							element << s
-							result << element
-						}
-					end
-				end
+        begin
+          
+          # local substitutions
+          if /local/ =~ @sub_hash[s].scope then
+            if /before/ =~ @sub_hash[s].scope then
+              element = @sub_hash[s].match_hash[i_file][0].dup
+              element[1] = element[0] - 1
+              element << s
+              result << element
+            elsif /after/ =~ @sub_hash[s].scope then
+              element = @sub_hash[s].match_hash[i_file][0].dup
+              element[0] = element[1] + 1
+              element << s
+              result << element
+            else
+              element = @sub_hash[s].match_hash[i_file][0].dup
+              element << s
+              result << element
+            end
+          
+          # global substitutions
+          else
+            if /before/ =~ @sub_hash[s].scope then
+              @sub_hash[s].match_hash[i_file].each { |m|
+                element = m.dup
+                element[1] = element[0] - 1
+                element << s
+                result << element
+              }
+            elsif /after/ =~ @sub_hash[s].scope then
+              @sub_hash[s].match_hash[i_file].each { |m|
+                element = m.dup
+                element[0] = element[1] + 1
+                element << s
+                result << element
+              }
+            else
+              @sub_hash[s].match_hash[i_file].each { |m|
+                element = m.dup
+                element << s
+                result << element
+              }
+            end
+          end
+          
+        rescue
+          Error.unable_to_match(s, @sub_hash[s].reg_exp, i_file)  
+        end #exception
 			}
 			result.sort! { |e1, e2|
 				if e1[0] == e2[0] then

data/lib/EFL_errors.rb

@@ -40,9 +40,13 @@ module Error #:nodoc: all
 			}
 			<<-CODE
 				if !#{receiver}?(#{c[receiver].at(0).join(', ')})
-					raise "Collision between #{c[receiver].at(1)}s"
+					raise "\nCollision between #{c[receiver].at(1)}s\n"
 				end
 			CODE
 		end #Error.collision
+    
+    def Error.unable_to_match(substitution_name, reg_exp, file)
+        raise "\nERROR: No matching for the regular expression <<#{reg_exp}>> of the substitution <<#{substitution_name}>> against the file <<#{file}>>\n"
+    end #unable_to_match
 		
 	end #Error

data/lib/EFL_regexp_generator.rb

@@ -67,4 +67,3 @@ def inside_nested_symbols(beginSymbol, endSymbol, levels=50)
 	quit_begin_and_end_symbols = /[^#{beginSymbol}].*(?=#{endSymbol})/xm
 	return (nested_symbols(beginSymbol, endSymbol, levels) > quit_begin_and_end_symbols)
 end #nestedSymbols
-

data/lib/EFL_substitution.rb

@@ -109,25 +109,25 @@ def get_match_pos(str, reg_exp, scope)
       # zoom matching
       ############################      
       reg_exp.zoom_list = [reg_exp.dup] unless reg_exp.zoom_list 	
-	pos1 = match_pos(str, reg_exp.zoom_list[0], scope)
-	pos2, pos3 = [], []
-	i = 1
-	while i<reg_exp.zoom_list.length
-		j = 0
-		pos1.each {|aux|
-			pos2 = match_pos(str[aux[0], aux[1]-aux[0]+1], reg_exp.zoom_list[i], scope)
-			pos2.map! {|e|
-				e[0] = e[0] + pos1[j][0] 
-				e[1] = e[1] + pos1[j][0]
-				e
-			}
-			pos3 << pos2.dup
-			j += 1	
-		}
-		pos1 = format_array(pos3)
-		pos3 = []
-		i += 1
-	end #while
+      pos1 = match_pos(str, reg_exp.zoom_list[0], scope)
+      pos2, pos3 = [], []
+      i = 1
+      while i<reg_exp.zoom_list.length
+        j = 0
+        pos1.each {|aux|
+          pos2 = match_pos(str[aux[0], aux[1]-aux[0]+1], reg_exp.zoom_list[i], scope)
+          pos2.map! {|e|
+            e[0] = e[0] + pos1[j][0] 
+            e[1] = e[1] + pos1[j][0]
+            e
+          }
+          pos3 << pos2.dup
+          j += 1	
+        }
+        pos1 = format_array(pos3)
+        pos3 = []
+        i += 1
+      end #while
       
       ############################
       # minus matching
@@ -166,9 +166,11 @@ def crash?(substitution, i_file)
 	File.open(i_file) { |f| i_string = f.read }
 	
 	self.match_hash[i_file] = get_match_pos(i_string, self.reg_exp, self.scope) unless self.match_hash[i_file]
-				
+  #Error.unable_to_match(self, i_file, self.match_hash[i_file])
+  				
 	substitution.match_hash[i_file] = get_match_pos(i_string, substitution.reg_exp, substitution.scope) unless substitution.match_hash[i_file]
-
+  #Error.unable_to_match(substitution, i_file, substitution.match_hash[i_file])
+  
 	crash = false
 							
 	if (/before/  =~ self.scope) or  (/after/  =~ self.scope) or 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: EFL
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2007-11-16 00:00:00 +01:00
+  version: 1.0.1
+date: 2008-02-19 00:00:00 +01:00
 summary: A Ruby implementation of the Exemplar Flexibilization Language
 require_paths: 
 - lib
@@ -77,6 +77,7 @@ files:
 - lib/doc/fr_file_index.html
 - lib/doc/fr_method_index.html
 - lib/doc/index.html
+- lib/doc.zip
 - lib/EFL.rb
 - lib/EFL_array.rb
 - lib/EFL_errors.rb
@@ -87,6 +88,7 @@ files:
 - lib/EFL_substitution.rb
 - lib/EFL_syntactic_sugar.rb
 - lib/Hash Doc.doc
+- lib/lib.zip
 - lib/Limitaciones.txt
 - tests/Add_Sup_1.rb
 - tests/Add_Sup_1.rb.bak