Reviewers: MarkM,

Description:
Removes the cast to Object in canReadRev so that 'length' in '123'
throws a TypeError properly.

Please review this at http://codereview.appspot.com/97047

Affected files:
  M     src/com/google/caja/parser/js/CajoledModuleExpression.java
  M     src/com/google/caja/valija-cajita.js
  M     tests/com/google/caja/parser/quasiliteral/CajitaRewriterTest.java
M tests/com/google/caja/parser/quasiliteral/DefaultValijaRewriterTest.java


Index: tests/com/google/caja/parser/quasiliteral/DefaultValijaRewriterTest.java
===================================================================
--- tests/com/google/caja/parser/quasiliteral/DefaultValijaRewriterTest.java (revision 3598) +++ tests/com/google/caja/parser/quasiliteral/DefaultValijaRewriterTest.java (working copy)
@@ -216,7 +216,7 @@
     assertConsistent("var a = { x: 1 }; delete a.x; typeof a.x;");
   }

-  public void testIn() throws Exception {
+  public void testIn2() throws Exception {
     assertConsistent(
         "(function () {" +
         "  var a = { x: 1 };\n" +
Index: tests/com/google/caja/parser/quasiliteral/CajitaRewriterTest.java
===================================================================
--- tests/com/google/caja/parser/quasiliteral/CajitaRewriterTest.java (revision 3598) +++ tests/com/google/caja/parser/quasiliteral/CajitaRewriterTest.java (working copy)
@@ -53,7 +53,6 @@
 public class CajitaRewriterTest extends CommonJsRewriterTestCase {

   protected class TestPluginEnvironment implements PluginEnvironment {
-    @Override
     public CharProducer loadExternalResource(
         ExternalReference ref, String mimeType) {
       URI uri = ref.getUri();
@@ -68,7 +67,6 @@
       return null;
     }

-    @Override
     public String rewriteUri(ExternalReference uri, String mimeType) {
       return null;
     }
Index: src/com/google/caja/parser/js/CajoledModuleExpression.java
===================================================================
--- src/com/google/caja/parser/js/CajoledModuleExpression.java (revision 3598) +++ src/com/google/caja/parser/js/CajoledModuleExpression.java (working copy)
@@ -54,11 +54,8 @@
     return childrenAs(CajoledModule.class).get(0);
   }

-  @Override
   public void render(RenderContext r) {
     ObjectConstructor oc = getCajoledModule().getModuleBody();
-    FunctionConstructor fc =
-      ((FunctionConstructor) oc.getValue("instantiate"));

     Expression e = (Expression) QuasiBuilder.substV(
       "___.prepareModule(@module);",
Index: src/com/google/caja/valija-cajita.js
===================================================================
--- src/com/google/caja/valija-cajita.js        (revision 3598)
+++ src/com/google/caja/valija-cajita.js        (working copy)
@@ -447,7 +447,7 @@
   }

   function canReadRev(name, obj) {
-    if (name in new Object(obj)) { return true; }
+    if (name in obj) { return true; }
     return name in getSupplement(obj);
   }



Reply via email to