ParserBase.java (hsqldb-2.6.0) | : | ParserBase.java (hsqldb-2.6.1) | ||
---|---|---|---|---|
skipping to change at line 51 | skipping to change at line 51 | |||
import org.hsqldb.lib.OrderedHashMap; | import org.hsqldb.lib.OrderedHashMap; | |||
import org.hsqldb.map.ValuePool; | import org.hsqldb.map.ValuePool; | |||
import org.hsqldb.types.IntervalType; | import org.hsqldb.types.IntervalType; | |||
import org.hsqldb.types.NumberType; | import org.hsqldb.types.NumberType; | |||
import org.hsqldb.types.TimeData; | import org.hsqldb.types.TimeData; | |||
import org.hsqldb.types.Type; | import org.hsqldb.types.Type; | |||
import org.hsqldb.types.Types; | import org.hsqldb.types.Types; | |||
/** | /** | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.6.0 | * @version 2.6.1 | |||
* @since 1.9.0 | * @since 1.9.0 | |||
*/ | */ | |||
public class ParserBase { | public class ParserBase { | |||
protected Scanner scanner; | protected Scanner scanner; | |||
protected Token token; | protected Token token; | |||
// | // | |||
protected int partPosition; | protected int partPosition; | |||
protected HsqlException lastError; | protected HsqlException lastError; | |||
protected HsqlName lastSynonym; | protected HsqlName lastSynonym; | |||
protected boolean isCheckOrTriggerCondition; | protected boolean isCheckOrTriggerCondition; | |||
protected boolean isSchemaDefinition; | protected boolean isSchemaDefinition; | |||
protected boolean isViewDefinition; | protected boolean isViewDefinition; | |||
protected boolean isRecording; | protected boolean isRecording; | |||
protected HsqlArrayList recordedStatement; | protected HsqlArrayList recordedStatement; | |||
skipping to change at line 250 | skipping to change at line 250 | |||
recordedStatement.add(dup); | recordedStatement.add(dup); | |||
} | } | |||
} | } | |||
void replaceToken(Token token1, Token token2) { | void replaceToken(Token token1, Token token2) { | |||
String tokenString = token1.tokenString; | String tokenString = token1.tokenString; | |||
if (token2 != null) { | if (token2 != null) { | |||
tokenString += " " + token2.tokenString; | tokenString += token2.tokenString; | |||
} | } | |||
tokenString += " "; | ||||
scanner.replaceToken(tokenString); | scanner.replaceToken(tokenString); | |||
if (isRecording) { | if (isRecording) { | |||
token1.position = scanner.getTokenPosition(); | token1.position = scanner.getTokenPosition(); | |||
recordedStatement.set(recordedStatement.size() - 1, token1); | recordedStatement.set(recordedStatement.size() - 1, token1); | |||
if (token2 != null) { | if (token2 != null) { | |||
recordedStatement.add(token2); | recordedStatement.add(token2); | |||
} | } | |||
End of changes. 4 change blocks. | ||||
4 lines changed or deleted | 6 lines changed or added |