v4.2
Merge branch 'installer'

Conflicts:
	innerTestImpl/README
	innerTestImpl/src/edu/pku/innerTest/ActionKeys.java
	innerTestImpl/src/edu/pku/innerTest/Checker.java
	innerTestImpl/src/edu/pku/innerTest/ClassSwapper.java
	innerTestImpl/src/edu/pku/innerTest/Controller.java
	innerTestImpl/src/edu/pku/innerTest/UserChecker.java
	innerTestImpl/src/edu/pku/innerTest/test/Calculator.java
	innerTestImpl/src/edu/pku/innerTest/test/Calculator2.java
	innerTestImpl/src/edu/pku/innerTest/test/MathCalculator.java
	innerTestImpl/src/edu/pku/innerTest/test/TestCalculator.java
	innerTestImpl/src/edu/pku/innerTest/test/TestDiff.java
	innerTestImpl/src/edu/pku/innerTest/test/TestDiff2.java
	innerTestImpl/src/edu/pku/innerTest/test/TestMathCalculator.java
	innerTestImpl/src/edu/pku/test/expression/Expression.java
	innerTestImpl/src/edu/pku/test/expression/ExpressionFactory.java
	innerTestImpl/src/edu/pku/test/expression/lexical/LexicalAnalyzer.java
	innerTestImpl/src/edu/pku/test/expression/lexical/LexicalConstants.java
	innerTestImpl/src/edu/pku/test/expression/lexical/LexicalException.java

innerTestImpl/src/edu/pku/test/expression/lexical/dfa/DFADefinition.java

innerTestImpl/src/edu/pku/test/expression/lexical/dfa/DFAEndStateCode.ja
va
	innerTestImpl/src/edu/pku/test/expression/lexical/dfa/DFAMidState.java

innerTestImpl/src/edu/pku/test/expression/lexical/dfa/DFAMidStateCode.ja
va

innerTestImpl/src/edu/pku/test/expression/lexical/dfa/RouteToEndState.ja
va

innerTestImpl/src/edu/pku/test/expression/syntax/ArgumentsMismatchExcept
ion.java
	innerTestImpl/src/edu/pku/test/expression/syntax/Context.java
	innerTestImpl/src/edu/pku/test/expression/syntax/Executable.java
	innerTestImpl/src/edu/pku/test/expression/syntax/Grammar.java
	innerTestImpl/src/edu/pku/test/expression/syntax/SyntaxAnalyzer.java
	innerTestImpl/src/edu/pku/test/expression/syntax/SyntaxException.java

innerTestImpl/src/edu/pku/test/expression/syntax/VariableNotInitializedE
xception.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/AddOperator.ja
va

innerTestImpl/src/edu/pku/test/expression/syntax/operator/AndOperator.ja
va

innerTestImpl/src/edu/pku/test/expression/syntax/operator/AssignOperator
.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/BinaryOperator
.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/DivideOperator
.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/EqualOperator.
java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/GreatEOperator
.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/GreatOperator.
java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/LessEOperator.
java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/LessOperator.j
ava

innerTestImpl/src/edu/pku/test/expression/syntax/operator/MinusOperator.
java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/ModOperator.ja
va

innerTestImpl/src/edu/pku/test/expression/syntax/operator/MultiplyOperat
or.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/NegativeOperat
or.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/NotEqualOperat
or.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/NotOperator.ja
va
	innerTestImpl/src/edu/pku/test/expression/syntax/operator/Operator.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/OperatorFactor
y.java

innerTestImpl/src/edu/pku/test/expression/syntax/operator/OrOperator.jav
a

innerTestImpl/src/edu/pku/test/expression/syntax/operator/UnaryOperator.
java
	innerTestImpl/src/edu/pku/test/expression/test.java
	innerTestImpl/src/edu/pku/test/expression/tokens/ConstToken.java
	innerTestImpl/src/edu/pku/test/expression/tokens/DataType.java
	innerTestImpl/src/edu/pku/test/expression/tokens/DelimiterToken.java
	innerTestImpl/src/edu/pku/test/expression/tokens/ExecutionToken.java
	innerTestImpl/src/edu/pku/test/expression/tokens/NonterminalToken.java
	innerTestImpl/src/edu/pku/test/expression/tokens/RuntimeValue.java
	innerTestImpl/src/edu/pku/test/expression/tokens/TerminalToken.java
	innerTestImpl/src/edu/pku/test/expression/tokens/Token.java
	innerTestImpl/src/edu/pku/test/expression/tokens/TokenBuilder.java
	innerTestImpl/src/edu/pku/test/expression/tokens/TokenType.java
	innerTestImpl/src/edu/pku/test/expression/tokens/Valuable.java
	innerTestImpl/src/edu/pku/test/expression/tokens/ValueToken.java
	innerTestImpl/src/edu/pku/test/expression/tokens/VariableToken.java
	innerTestImpl/src/edu/pku/test/expression/utils/DataCache.java
	innerTestImpl/src/edu/pku/test/expression/utils/ExpressionUtil.java
	innerTestImpl/src/edu/pku/test/expression/utils/Stack.java
	innerTestImpl/src/edu/pku/test/expression/utils/ValueUtil.java
	innerTestImpl/src/edu/pku/test/instrument/CodeGeneratable.java
	innerTestImpl/src/edu/pku/test/instrument/CodeGenerateAgent.java
	innerTestImpl/src/edu/pku/test/instrument/CodeTemplate.java
	innerTestImpl/src/edu/pku/test/instrument/InstructionType.java
	innerTestImpl/src/edu/pku/test/instrument/InstrumentTemplate.java
	innerTestImpl/src/edu/pku/test/instrument/Instrumentable.java
	innerTestImpl/src/edu/pku/test/instrument/Instrumentor.java
	innerTestImpl/src/edu/pku/test/instrument/InstrumentorConfig.java
	innerTestImpl/src/edu/pku/test/instrument/Transformer.java
	innerTestImpl/src/edu/pku/test/instrument/agent/InstrumentAgent.java

innerTestImpl/src/edu/pku/test/instrument/agent/LabelInstrumentAgent.jav
a

innerTestImpl/src/edu/pku/test/instrument/agent/LineNumberInstrumentAgen
t.java

innerTestImpl/src/edu/pku/test/instrument/agent/RelativeLineNumberInstru
mentAgent.java
	innerTestImpl/src/edu/pku/test/instrument/utils/ByteCodeUtil.java
	innerTestImpl/src/edu/pku/test/instrument/variables/BasicVariable.java

innerTestImpl/src/edu/pku/test/instrument/variables/BooleanVariable.java
	innerTestImpl/src/edu/pku/test/instrument/variables/ByteVariable.java

innerTestImpl/src/edu/pku/test/instrument/variables/CharacterVariable.ja
va
	innerTestImpl/src/edu/pku/test/instrument/variables/DoubleVariable.java
	innerTestImpl/src/edu/pku/test/instrument/variables/FloatVariable.java

innerTestImpl/src/edu/pku/test/instrument/variables/IntegerVariable.java
	innerTestImpl/src/edu/pku/test/instrument/variables/LongVariable.java
	innerTestImpl/src/edu/pku/test/instrument/variables/RefVariable.java
	innerTestImpl/src/edu/pku/test/instrument/variables/Variable.java

innerTestImpl/src/edu/pku/test/instrument/variables/VariableFactory.java