Mozilla bug 1392185 - Remove special handling of atoms in the HTML5 parser. r=hsivonen.

Author: emilio

translator-src/nu/validator/htmlparser/cpptranslate/CppTypes.java

@@ -235,12 +235,16 @@ public String stringType() {
         return "nsHtml5String";
     }
 
-    public String localType() {
+    public String weakLocalType() {
         return "nsAtom*";
     }
 
+    public String localType() {
+        return "RefPtr<nsAtom>";
+    }
+
     public String prefixType() {
-        return "nsAtom*";
+        return "nsStaticAtom*";
     }
 
     public String nsUriType() {

translator-src/nu/validator/htmlparser/cpptranslate/CppVisitor.java

@@ -204,6 +204,10 @@ public String getSource() {
 
     protected boolean inPrimitiveNoLengthFieldDeclarator = false;
 
+    protected boolean inField = false;
+
+    protected boolean inArray = false;
+
     protected final SymbolTable symbolTable;
 
     protected String definePrefix;
@@ -467,7 +471,7 @@ public void visit(ClassOrInterfaceType n, LocalSymbolTable arg) {
         String name = n.getName();
         if ("String".equals(name)) {
             if (local()) {
-                name = cppTypes.localType();
+                name = inField || inArray ? cppTypes.localType() : cppTypes.weakLocalType();
             } else if (prefix()) {
                 name = cppTypes.prefixType();
             } else if (nsUri()) {
@@ -559,6 +563,10 @@ public void visit(ReferenceType n, LocalSymbolTable arg) {
         if (isConst()) {
             printer.print("const ");
         }
+        boolean wasInArray = inArray;
+        if (n.getArrayCount() > 0) {
+            inArray = true;
+        }
         if (noLength()) {
             n.getType().accept(this, arg);
             for (int i = 0; i < n.getArrayCount(); i++) {
@@ -586,6 +594,9 @@ public void visit(ReferenceType n, LocalSymbolTable arg) {
                 printer.print(">");
             }
         }
+        if (n.getArrayCount() > 0) {
+            inArray = wasInArray;
+        }
     }
 
     public void visit(WildcardType n, LocalSymbolTable arg) {
@@ -616,6 +627,7 @@ protected boolean isNonToCharArrayMethodCall(Expression exp) {
     }
 
     protected void fieldDeclaration(FieldDeclaration n, LocalSymbolTable arg) {
+        inField = true;
         tempPrinterHolder = printer;
         printer = staticInitializerPrinter;
         int modifiers = n.getModifiers();
@@ -777,6 +789,7 @@ protected void fieldDeclaration(FieldDeclaration n, LocalSymbolTable arg) {
         currentArrayCount = 0;
         printer = tempPrinterHolder;
         inPrimitiveNoLengthFieldDeclarator = false;
+        inField = false;
     }
 
     private void printArrayInit(VariableDeclaratorId variableDeclaratorId,
@@ -854,6 +867,7 @@ public void visit(ArrayCreationExpr n, LocalSymbolTable arg) {
         // n.getType().accept(this, arg);
         // printTypeArgs(n.getTypeArgs(), arg);
 
+        inArray = true;
         if (n.getDimensions() != null) {
             if (noLength()) {
                 for (Expression dim : n.getDimensions()) {
@@ -887,6 +901,7 @@ public void visit(ArrayCreationExpr n, LocalSymbolTable arg) {
                     "Array initializer as part of array creation not supported. "
                             + n.toString());
         }
+        inArray = false;
     }
 
     public void visit(AssignExpr n, LocalSymbolTable arg) {

translator-src/nu/validator/htmlparser/cpptranslate/HVisitor.java

@@ -197,6 +197,7 @@ public HVisitor(CppTypes cppTypes, SymbolTable symbolTable) {
      * @see nu.validator.htmlparser.cpptranslate.CppVisitor#fieldDeclaration(japa.parser.ast.body.FieldDeclaration, java.lang.LocalSymbolTable)
      */
     @Override protected void fieldDeclaration(FieldDeclaration n, LocalSymbolTable arg) {
+        inField = true;
         int modifiers = n.getModifiers();
         List<VariableDeclarator> variables = n.getVariables();
         VariableDeclarator declarator = variables.get(0);
@@ -253,6 +254,7 @@ public HVisitor(CppTypes cppTypes, SymbolTable symbolTable) {
             inStatic = false;
             inPrimitiveNoLengthFieldDeclarator = false;
         }
+        inField = false;
     }
 
     /**