← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/ruby1.9/intrepid-updates

« back to all changes in this revision

Viewing changes to lib/rexml/parsers/baseparser.rb

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-09-04 16:01:17 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20070904160117-i15zckg2nhxe9fyw
Tags: 1.9.0+20070830-2ubuntu1
* Sync from Debian; remaining changes:
  - Add -g to CFLAGS.
* Fixes build failure on ia64.
* Fixes build failure with gcc-4.2 on lpia.
* Robustify check for target_os, fixing build failure on lpia.
* Set Ubuntu maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/rexml/parsers/baseparser.rb
53
53
      STANDALONE = /\bstandalone\s*=\s["'](.*?)['"]/um
54
54
 
55
55
      ENTITY_START = /^\s*<!ENTITY/
56
 
      IDENTITY = /^([!\*\w\-]+)(\s+#{NCNAME_STR})?(\s+["'].*?['"])?(\s+['"].*?["'])?/u
 
56
      IDENTITY = /^([!\*\w\-]+)(\s+#{NCNAME_STR})?(\s+["'](.*?)['"])?(\s+['"](.*?)["'])?/u
57
57
      ELEMENTDECL_START = /^\s*<!ELEMENT/um
58
58
      ELEMENTDECL_PATTERN = /^\s*(<!ELEMENT.*?)>/um
59
59
      SYSTEMENTITY = /^\s*(%.*?;)\s*$/um
217
217
            close = md[2]
218
218
            identity =~ IDENTITY
219
219
            name = $1
220
 
            raise REXML::ParseException("DOCTYPE is missing a name") if name.nil?
 
220
            raise REXML::ParseException.new("DOCTYPE is missing a name") if name.nil?
221
221
            pub_sys = $2.nil? ? nil : $2.strip
222
 
            long_name = $3.nil? ? nil : $3.strip
223
 
            uri = $4.nil? ? nil : $4.strip
 
222
            long_name = $4.nil? ? nil : $4.strip
 
223
            uri = $6.nil? ? nil : $6.strip
224
224
            args = [ :start_doctype, name, pub_sys, long_name, uri ]
225
225
            if close == ">"
226
226
              @document_status = :after_doctype