|
|
5668 Add a test which fails if SES is not happy ...
5669 Remove unused JsonML support from JS parse trees.
The merge command was
svn merge -c 5668,5669 ^/trunk
and there was one semantic conflict:
JsonML support had to be removed from CajoledModule which is not in
trunk.
@r5670
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+10 lines, -2108 lines) |
Patch |
 |
M |
.
|
View
|
|
0 chunks |
+0 lines, -0 lines |
0 comments
|
Download
|
 |
MM |
build.xml
|
View
|
|
3 chunks |
+0 lines, -7 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ArrayConstructor.java
|
View
|
|
2 chunks |
+0 lines, -15 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Block.java
|
View
|
|
2 chunks |
+0 lines, -21 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/BooleanLiteral.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/BreakStmt.java
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/CajoledModule.java
|
View
|
|
3 chunks |
+1 line, -13 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/CaseStmt.java
|
View
|
|
2 chunks |
+0 lines, -10 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/CatchStmt.java
|
View
|
|
2 chunks |
+0 lines, -10 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Conditional.java
|
View
|
|
2 chunks |
+0 lines, -28 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ContinueStmt.java
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/DebuggerStmt.java
|
View
|
|
2 chunks |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Declaration.java
|
View
|
|
2 chunks |
+0 lines, -21 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/DefaultCaseStmt.java
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Directive.java
|
View
|
|
3 chunks |
+1 line, -12 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/DirectivePrologue.java
|
View
|
|
2 chunks |
+0 lines, -10 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/DoWhileLoop.java
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Expression.java
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ExpressionStmt.java
|
View
|
|
2 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/FinallyStmt.java
|
View
|
|
2 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ForEachLoop.java
|
View
|
|
2 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ForLoop.java
|
View
|
|
2 chunks |
+0 lines, -13 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/FunctionConstructor.java
|
View
|
|
2 chunks |
+0 lines, -33 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/FunctionDeclaration.java
|
View
|
|
2 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/GetterProperty.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Identifier.java
|
View
|
|
3 chunks |
+1 line, -15 lines |
0 comments
|
Download
|
 |
D |
src/com/google/caja/parser/js/JsonMLCompatible.java
|
View
|
|
1 chunk |
+0 lines, -103 lines |
0 comments
|
Download
|
 |
D |
src/com/google/caja/parser/js/JsonMLConverter.java
|
View
|
|
1 chunk |
+0 lines, -465 lines |
0 comments
|
Download
|
 |
D |
src/com/google/caja/parser/js/JsonMLParser.java
|
View
|
|
1 chunk |
+0 lines, -46 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/LabeledStatement.java
|
View
|
|
2 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/LabeledStmtWrapper.java
|
View
|
|
2 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/MultiDeclaration.java
|
View
|
|
2 chunks |
+0 lines, -12 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/NoChildren.java
|
View
|
|
2 chunks |
+0 lines, -3 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Noop.java
|
View
|
|
2 chunks |
+0 lines, -7 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/NullLiteral.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/NumberLiteral.java
|
View
|
|
2 chunks |
+0 lines, -22 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ObjProperty.java
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ObjectConstructor.java
|
View
|
|
2 chunks |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Operation.java
|
View
|
|
2 chunks |
+0 lines, -128 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Parser.java
|
View
|
|
2 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Reference.java
|
View
|
|
2 chunks |
+0 lines, -21 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/RegexpLiteral.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/RenderedExpression.java
|
View
|
|
2 chunks |
+0 lines, -7 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ReturnStmt.java
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/SetterProperty.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/Statement.java
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/StringLiteral.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/SwitchStmt.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ThrowStmt.java
|
View
|
|
2 chunks |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/TranslatedCode.java
|
View
|
|
2 chunks |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/TryStmt.java
|
View
|
|
2 chunks |
+0 lines, -18 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/ValueProperty.java
|
View
|
|
2 chunks |
+0 lines, -11 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/WhileLoop.java
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
src/com/google/caja/parser/js/WithStmt.java
|
View
|
|
2 chunks |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
tests/com/google/caja/parser/ParseTreeNodeTest.java
|
View
|
|
2 chunks |
+0 lines, -3 lines |
0 comments
|
Download
|
 |
D |
tests/com/google/caja/parser/js/JsonMLCompatibleTest.java
|
View
|
|
1 chunk |
+0 lines, -821 lines |
0 comments
|
Download
|
 |
M |
tests/com/google/caja/plugin/browser-tests.json
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
tests/com/google/caja/ses/test-ses-loading.html
|
View
|
|
1 chunk |
+3 lines, -2 lines |
0 comments
|
Download
|
 |
M |
third_party
|
View
|
|
0 chunks |
+0 lines, -0 lines |
0 comments
|
Download
|
 |
D |
third_party/java/jsonml/LICENSE
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
D |
third_party/java/jsonml/README
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
D |
third_party/java/jsonml/jsonml.jar
|
View
|
|
Binary file |
0 comments
|
Download
|
Total messages: 2
|