Reviewers: felix8a,
Description:
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.
Please review this at https://codereview.appspot.com/68980045/
Affected files (+9, -2107 lines):
M .
MM build.xml
M src/com/google/caja/parser/js/ArrayConstructor.java
M src/com/google/caja/parser/js/Block.java
M src/com/google/caja/parser/js/BooleanLiteral.java
M src/com/google/caja/parser/js/BreakStmt.java
M src/com/google/caja/parser/js/CajoledModule.java
M src/com/google/caja/parser/js/CaseStmt.java
M src/com/google/caja/parser/js/CatchStmt.java
M src/com/google/caja/parser/js/Conditional.java
M src/com/google/caja/parser/js/ContinueStmt.java
M src/com/google/caja/parser/js/DebuggerStmt.java
M src/com/google/caja/parser/js/Declaration.java
M src/com/google/caja/parser/js/DefaultCaseStmt.java
M src/com/google/caja/parser/js/Directive.java
M src/com/google/caja/parser/js/DirectivePrologue.java
M src/com/google/caja/parser/js/DoWhileLoop.java
M src/com/google/caja/parser/js/Expression.java
M src/com/google/caja/parser/js/ExpressionStmt.java
M src/com/google/caja/parser/js/FinallyStmt.java
M src/com/google/caja/parser/js/ForEachLoop.java
M src/com/google/caja/parser/js/ForLoop.java
M src/com/google/caja/parser/js/FunctionConstructor.java
M src/com/google/caja/parser/js/FunctionDeclaration.java
M src/com/google/caja/parser/js/GetterProperty.java
M src/com/google/caja/parser/js/Identifier.java
D src/com/google/caja/parser/js/JsonMLCompatible.java
D src/com/google/caja/parser/js/JsonMLConverter.java
D src/com/google/caja/parser/js/JsonMLParser.java
M src/com/google/caja/parser/js/LabeledStatement.java
M src/com/google/caja/parser/js/LabeledStmtWrapper.java
M src/com/google/caja/parser/js/MultiDeclaration.java
M src/com/google/caja/parser/js/NoChildren.java
M src/com/google/caja/parser/js/Noop.java
M src/com/google/caja/parser/js/NullLiteral.java
M src/com/google/caja/parser/js/NumberLiteral.java
M src/com/google/caja/parser/js/ObjProperty.java
M src/com/google/caja/parser/js/ObjectConstructor.java
M src/com/google/caja/parser/js/Operation.java
M src/com/google/caja/parser/js/Parser.java
M src/com/google/caja/parser/js/Reference.java
M src/com/google/caja/parser/js/RegexpLiteral.java
M src/com/google/caja/parser/js/RenderedExpression.java
M src/com/google/caja/parser/js/ReturnStmt.java
M src/com/google/caja/parser/js/SetterProperty.java
M src/com/google/caja/parser/js/Statement.java
M src/com/google/caja/parser/js/StringLiteral.java
M src/com/google/caja/parser/js/SwitchStmt.java
M src/com/google/caja/parser/js/ThrowStmt.java
M src/com/google/caja/parser/js/TranslatedCode.java
M src/com/google/caja/parser/js/TryStmt.java
M src/com/google/caja/parser/js/ValueProperty.java
M src/com/google/caja/parser/js/WhileLoop.java
M src/com/google/caja/parser/js/WithStmt.java
M tests/com/google/caja/parser/ParseTreeNodeTest.java
D tests/com/google/caja/parser/js/JsonMLCompatibleTest.java
M tests/com/google/caja/plugin/browser-tests.json
M tests/com/google/caja/ses/test-ses-loading.html
M third_party
D third_party/java/jsonml/LICENSE
D third_party/java/jsonml/README
D third_party/java/jsonml/jsonml.jar
--
---
You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
