Changeset 136

Timestamp:

04/09/2007 11:44:51 (20 months ago)

Author:

why

Message:

• lib/hpricot/parse.rb: conflict between two variables, both named trans. see #74.
  

Files:

• trunk/lib/hpricot/parse.rb (modified) (4 diffs)

trunk/lib/hpricot/parse.rb

@@ -30 +30 @@
     end
 
-    trans = opts[:xml] ? :to_s : :downcase
+    conv = opts[:xml] ? :to_s : :downcase
 
     fragment =
@@ -51 +51 @@
       Hpricot.scan(input) do |token|
         if stack.last[5] == :CDATA and ![:procins, :comment, :cdata].include?(token[0]) and
-            !(token[0] == :etag and token[1].send(trans) == stack.last[0])
+            !(token[0] == :etag and token[1].send(conv) == stack.last[0])
           token[0] = :text
           token[1] = token[3] if token[3]
@@ -62 +62 @@
           end
 
-          stagname = token[0] = token[1].send(trans)
+          stagname = token[0] = token[1].send(conv)
           if ElementContent[stagname] == :EMPTY and !opts[:xml]
             token[0] = :emptytag
@@ -115 +115 @@
           end
         when :etag
-          etagname = token[0] = token[1].send(trans)
+          etagname = token[0] = token[1].send(conv)
           if opts[:xhtml_strict] and not ElementContent.has_key? etagname
             etagname = token[0] = "div"