corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 482921 part 4 - Support XML syntax highlighting in the parser core. r=Olli.Pettay.

Browse Source
This commit is contained in:
Henri Sivonen
2011-11-01 13:33:11 +02:00
parent 6bd519ac43
commit 8153c335a6
10 changed files with 204 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
parser/html/javasrc/Tokenizer.java
View File

@@ -216,6 +216,10 @@ public class Tokenizer implements Locator {
public static final int SCRIPT_DATA_DOUBLE_ESCAPE_END = 72;
public static final int PROCESSING_INSTRUCTION = 73;
public static final int PROCESSING_INSTRUCTION_QUESTION_MARK = 74;
/**
* Magic value for UTF-16 operations.
*/
@@ -505,6 +509,8 @@ public class Tokenizer implements Locator {
private Interner interner;
// CPPONLY: private boolean viewingXmlSource;
// [NOCPP[
protected LocatorImpl ampersandLocation;
@@ -531,7 +537,9 @@ public class Tokenizer implements Locator {
* @param tokenHandler
* the handler for receiving tokens
*/
public Tokenizer(TokenHandler tokenHandler) {
public Tokenizer(TokenHandler tokenHandler
// CPPONLY: , boolean viewingXmlSource
) {
this.tokenHandler = tokenHandler;
this.encodingDeclarationHandler = null;
// [NOCPP[
@@ -545,6 +553,7 @@ public class Tokenizer implements Locator {
this.publicIdentifier = null;
this.systemIdentifier = null;
this.attributes = null;
// CPPONLY: this.viewingXmlSource = viewingXmlSource;
}
public void setInterner(Interner interner) {
@@ -557,6 +566,10 @@ public class Tokenizer implements Locator {
}
// CPPONLY: boolean isViewingXmlSource() {
// CPPONLY: return viewingXmlSource;
// CPPONLY: }
// [NOCPP[
/**
@@ -1118,10 +1131,16 @@ public class Tokenizer implements Locator {
* switched to the PCDATA state.
*/
maybeErrAttributesOnEndTag(attrs);
// CPPONLY: if (!viewingXmlSource) {
tokenHandler.endTag(tagName);
// CPPONLY: }
Portability.delete(attributes);
} else {
// CPPONLY: if (viewingXmlSource) {
// CPPONLY: Portability.delete(attributes);
// CPPONLY: } else {
tokenHandler.startTag(tagName, attrs, selfClosing);
// CPPONLY: }
}
tagName.release();
tagName = null;
@@ -1534,6 +1553,13 @@ public class Tokenizer implements Locator {
state = transition(state, Tokenizer.CLOSE_TAG_OPEN, reconsume, pos);
continue stateloop;
case '?':
// CPPONLY: if (viewingXmlSource) {
// CPPONLY: state = transition(state,
// CPPONLY: Tokenizer.PROCESSING_INSTRUCTION,
// CPPONLY: reconsume,
// CPPONLY: pos);
// CPPONLY: continue stateloop;
// CPPONLY: }
/*
* U+003F QUESTION MARK (?) Parse error.
*/
@@ -5716,6 +5742,41 @@ public class Tokenizer implements Locator {
continue;
}
}
// XXX reorder point
case PROCESSING_INSTRUCTION:
processinginstructionloop: for (;;) {
if (++pos == endPos) {
break stateloop;
}
c = checkChar(buf, pos);
switch (c) {
case '?':
state = transition(
state,
Tokenizer.PROCESSING_INSTRUCTION_QUESTION_MARK,
reconsume, pos);
break processinginstructionloop;
// continue stateloop;
default:
continue;
}
}
case PROCESSING_INSTRUCTION_QUESTION_MARK:
if (++pos == endPos) {
break stateloop;
}
c = checkChar(buf, pos);
switch (c) {
case '>':
state = transition(state, Tokenizer.DATA,
reconsume, pos);
continue stateloop;
default:
state = transition(state,
Tokenizer.PROCESSING_INSTRUCTION,
reconsume, pos);
continue stateloop;
}
// END HOTSPOT WORKAROUND
}
}