Merge branch 'aoyama' into develop

Author: ryu1ao

src/instruction.c

@@ -87,6 +87,8 @@ struct InstrSpec spec[] = {
     {"tailatomlist", INSTR_TAILATOMLIST, {InstrVar, InstrVar}},
     {"atomtailatom", INSTR_ATOMTAILATOM, {InstrVar,InstrVar, InstrVar}},
 
+    {"memsetlink", INSTR_MEMSETLINK, {InstrVar, InstrVar}},
+
     {"allocatom", INSTR_ALLOCATOM, {InstrVar, ArgFunctor}},
     {"allocatomindirect", INSTR_ALLOCATOMINDIRECT, {InstrVar, InstrVar}},
     {"copyatom", INSTR_COPYATOM, {InstrVar, InstrVar, InstrVar}},

src/instruction.h

@@ -252,6 +252,7 @@ enum LmnInstruction {
   INSTR_HEADATOM,
   INSTR_TAILATOMLIST,
   INSTR_ATOMTAILATOM,
+  INSTR_MEMSETLINK,
 
   INSTR_PRINTINSTR
 };

src/task.c

@@ -1522,7 +1522,7 @@ static BOOL interpret(LmnReactCxt *rc, LmnRule rule, LmnRuleInstr instr)
         }else {
           /* シンボルアトムatom1とシンボルアトムap2 */
 	//////
-	        if(ap2){
+	        if(ap2 != NULL){
 			LMN_SATOM_SET_LINK(ap2, attr2, wt(rc, atom1));
 	          	LMN_SATOM_SET_ATTR(ap2, attr2, pos1);
 	          	LMN_SATOM_SET_LINK(LMN_SATOM(wt(rc, atom1)), pos1, ap2);
@@ -1553,7 +1553,7 @@ static BOOL interpret(LmnReactCxt *rc, LmnRule rule, LmnRuleInstr instr)
         }else if (!LMN_ATTR_IS_EX(at(rc, atom1)) && !LMN_ATTR_IS_EX(attr2)){
           /* シンボルアトムatom1とシンボルアトムap2 */
 	//////
-	        if(ap2){
+	        if(ap2 != NULL){
 			LMN_SATOM_SET_LINK(ap2, attr2, wt(rc, atom1));
 	          	LMN_SATOM_SET_ATTR(ap2, attr2, pos1);
 	          	LMN_SATOM_SET_LINK(LMN_SATOM(wt(rc, atom1)), pos1, ap2);
@@ -1573,7 +1573,7 @@ static BOOL interpret(LmnReactCxt *rc, LmnRule rule, LmnRuleInstr instr)
                && !LMN_ATTR_IS_EX(attr1) && !LMN_ATTR_IS_EX(attr2)){
         /* シンボルアトムatom2とシンボルアトムap1 */
 
-        if(ap1){
+        if(ap1 != NULL){
           LMN_SATOM_SET_LINK(LMN_SATOM(wt(rc, atom2)), pos2, ap1);
           LMN_SATOM_SET_ATTR(LMN_SATOM(wt(rc, atom2)), pos2, LMN_ATTR_GET_VALUE(attr1));
           LMN_SATOM_SET_LINK(ap1, attr1, wt(rc, atom2));
@@ -1593,7 +1593,7 @@ static BOOL interpret(LmnReactCxt *rc, LmnRule rule, LmnRuleInstr instr)
         }else {
           /* シンボルアトムatom1とシンボルアトムap2 */
 	//////
-	        if(ap2){
+	        if(ap2 != NULL){
 			LMN_SATOM_SET_LINK(ap2, LMN_ATTR_GET_VALUE(attr2), wt(rc, atom1));
 	          	LMN_SATOM_SET_ATTR(ap2, LMN_ATTR_GET_VALUE(attr2), pos1);
 	          	LMN_SATOM_SET_LINK(LMN_SATOM(wt(rc, atom1)), pos1, ap2);
@@ -1795,6 +1795,18 @@ static BOOL interpret(LmnReactCxt *rc, LmnRule rule, LmnRuleInstr instr)
         move_atom_to_atom_tail((LmnSAtom)wt(rc,atomi),(LmnSAtom)wt(rc,atomi2),(LmnMembrane *)wt(rc,memi));
         break;
       }
+    case INSTR_MEMSETLINK:
+      {
+	LmnInstrVar atomi, link;
+	
+	READ_VAL(LmnInstrVar, instr, atomi);
+	READ_VAL(LmnInstrVar, instr, link);
+	
+	
+	LMN_SATOM_SET_LINK(wt(rc,atomi), link, NULL);
+	
+	break;
+      }
     case INSTR_NEWMEM:
     {
       LmnInstrVar newmemi, parentmemi, memf;