Include super call in flushCache

Signed-off-by: Emma Söderberg <Emma.Soderberg@cs.lth.se>

src/jastadd/ast/Flush.jrag

@@ -41,10 +41,11 @@ aspect Flush {
     stream.println(ind + " */");
     stream.print(ind + "public void flushCache() {\n");
     if(grammar().block) stream.print(grammar().blockBegin);
-    if (grammar().fullFlush) {
     if(!name().equals("ASTNode")) {
       stream.print(ind(2) + "super.flushCache();\n");
-      } else {
+    } 
+    if (grammar().fullFlush) {
+      if (name().equals("ASTNode")) {
         emitFlushCacheForRewrites(stream);
       }
       stream.print(flushNTACacheString());

src/jastadd/ast/JragCodeGen.jrag

@@ -969,6 +969,7 @@ aspect JragCodeGen {
     for(int i = 0; i < getNumSynEq(); i++) {
        AttrEq equ = getSynEq(i);
        AttrDecl attr = equ.decl();
+       emitCacheDeclarations(out, attr);
        if (attr.isNTA() || attr.getLazy() || attr.isCircular()) {
          out.print(equ.hostFileComment());
          emitEquation(attr, equ.parametersDecl(), out);
@@ -976,8 +977,6 @@ aspect JragCodeGen {
        } else {
          attr.emitInlineCompute(equ, out);
        }
-
-       emitCacheDeclarations(out, attr);
     }
   }