bug fix: update spec and unsimpagationize

Author: imaren

src/compile/RulesetCompiler.java

@@ -154,6 +154,7 @@ public static void processMembrane(Membrane mem) {
       InterpretedRuleset ruleset = new InterpretedRuleset();
       // guard or 用に and のみを含むように分割したルールを合成する
       // -O3 前提
+      int maxlocals = 0;
       for (int itr = 0; itr < mem.or_pairs.size(); itr++) {
         LinkedList<Integer> pair = (LinkedList) mem.or_pairs.get(itr);
         if (pair.size() > 1) { // guard or を含む場合
@@ -162,6 +163,9 @@ public static void processMembrane(Membrane mem) {
             notAdd.add(pair.get(i));
             InstructionList orlist = new InstructionList();
             orlist.insts = InstructionList.cloneInstructions(rules.get(pair.get(i)).memMatch);
+            if(orlist.insts.get(0).getIntArg2() > maxlocals){
+              maxlocals = orlist.insts.get(0).getIntArg2();
+            }
             for (Instruction instr : rules.get(pair.get(i)).memMatch) {
               if (instr.getKind() == Instruction.ORDUMMY) { // ordummy 以降の命令をすべて branch で囲む
                 orlist.insts.remove(0);
@@ -174,6 +178,11 @@ public static void processMembrane(Membrane mem) {
           }
           // ordummy を guard or を表す branch 命令の列に置き換える
           List<Instruction> replace = rules.get(pair.get(0)).memMatch;
+          Instruction spec = replace.get(0);
+          if(spec.getIntArg2() > maxlocals){
+            maxlocals = spec.getIntArg2();
+          }
+          spec.updateSpec(spec.getIntArg1(), maxlocals);
           for (int i = 0; i < replace.size(); i++) {
             if (replace.get(i).getKind() == Instruction.ORDUMMY) {
               replace.addAll(i + 1, orlists.insts);

src/compile/parser/SrcRule.java

@@ -226,7 +226,18 @@ public void addTypeConstraint(LinkedList l) {
    */
   private void unSimpagationize(List head2) {
     // head を全てbodyへコピー (前に追加のほうが再利用の上でも都合がいい？)
-    body.addAll(copySrcs(head));
+    if(body.get(0) instanceof LinkedList){
+      for (int i=0; i<body.size(); i++) {
+        if(body.get(i) instanceof LinkedList){
+          LinkedList b = (LinkedList)body.get(i);
+          b.addAll(copySrcs(head));
+        }
+      }
+    }
+    else{
+      body.addAll(copySrcs(head));
+    }
+    
     // head2をheadの後ろに連結
     head.addAll(head2);
   }