Changeset 48
- Timestamp:
- 04/20/05 17:34:03 (4 years ago)
- Files:
-
- trunk/dsp (added)
- trunk/dsp/DSPException.d (added)
- trunk/dsp/DSPGrammar.d (added)
- trunk/dsp/DSPProcessor.d (added)
- trunk/dsp/DSPTag.d (added)
- trunk/dsp/ServletGenerator.d (added)
- trunk/dsp/StandardTagLibrary.d (added)
- trunk/dsp/TagLibrary.d (added)
- trunk/dsp/Util.d (added)
- trunk/dsp/tags (added)
- trunk/dsp/tags/Code.d (added)
- trunk/dsp/tags/InCode.d (added)
- trunk/dsp/tags/OutCode.d (added)
- trunk/dsp/tags/all.d (added)
- trunk/dspconf (added)
- trunk/dspconf/dsp01.dsp (added)
- trunk/dsptest.d (added)
- trunk/xml/BaseParser.d (modified) (1 diff)
- trunk/xml/XMLException.d (modified) (4 diffs)
- trunk/xml/XMLParser.d (modified) (1 diff)
- trunk/xml/xmlns/XMLNamespaceParser.d (modified) (1 diff)
- trunk/xmlconf (added)
- trunk/xmlconf/readme.txt (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/xml/BaseParser.d
r47 r48 84 84 lex.tokenize(stream); 85 85 tokens = lex.getTokens(); 86 startParse(); 86 try{ 87 startParse(); 88 } 89 catch(XMLParserException e){ 90 throw e; 91 } 92 catch(Exception e){ 93 throw new XMLParserException(e,this,peek().pos,"General parser error"); 94 } 95 87 96 } 88 97 trunk/xml/XMLException.d
r46 r48 36 36 37 37 class XMLException : Exception{ 38 XMLException cause;38 Exception cause; 39 39 40 40 public this(char[] reason){ … … 42 42 } 43 43 44 public this( XMLException cause,char[] reason){44 public this(Exception cause,char[] reason){ 45 45 super(reason); 46 46 this.cause = cause; … … 65 65 } 66 66 67 public this( XMLException cause,BaseLexer lex,ILexerStream stream,char[] reason){67 public this(Exception cause,BaseLexer lex,ILexerStream stream,char[] reason){ 68 68 super(cause,reason); 69 69 this.lex = lex; … … 89 89 } 90 90 91 public this( XMLException cause,BaseParser parser,Position pos,char[] reason){91 public this(Exception cause,BaseParser parser,Position pos,char[] reason){ 92 92 super(cause,reason); 93 93 this.parser = parser; trunk/xml/XMLParser.d
r46 r48 120 120 break; 121 121 } 122 else return; // something other than a PI, let parent worry about it 122 else{ 123 return; // something other than a PI, let parent worry about it 124 } 125 break; 123 126 124 127 default: 125 throw new XMLParserException(this,peek().pos,"expected processing instruction");128 return; // let parent worry about it 126 129 } 127 130 } trunk/xml/xmlns/XMLNamespaceParser.d
r47 r48 180 180 foreach(char[] name, char[] value; attribs){ 181 181 // handle default namespace 182 if(name == "xmlns"){ 182 if(name == "xmlns"){ 183 183 popNamespace(""); 184 184 consumer.xmlEndNamespace("",value);
