--- rpl/src/instructions_m2.c 2010/01/26 15:22:45 1.1.1.1 +++ rpl/src/instructions_m2.c 2011/06/20 17:54:18 1.20 @@ -1,7 +1,7 @@ /* ================================================================================ - RPL/2 (R) version 4.0.9 - Copyright (C) 1989-2010 Dr. BERTRAND Joël + RPL/2 (R) version 4.1.0.prerelease.1 + Copyright (C) 1989-2011 Dr. BERTRAND Joël This file is part of RPL/2. @@ -20,7 +20,7 @@ */ -#include "rpl.conv.h" +#include "rpl-conv.h" /* @@ -82,14 +82,14 @@ instruction_max(struct_processus *s_etat printf("-> 2: %s, %s, %s\n", d_INT, d_REL, d_CPL); printf(" 1: %s\n\n", d_LST); - printf(" 2: %s, %s, %s\n", d_INT, d_REL, d_CPL); - printf(" 1: %s, %s, %s\n", d_INT, d_REL, d_CPL); - printf("-> 1: %s, %s, %s\n\n", d_INT, d_REL, d_CPL); - - printf(" 2: %s, %s, %s, %s, %s, %s\n", - d_INT, d_REL, d_CPL, d_NOM, d_ALG, d_RPN); - printf(" 1: %s, %s, %s, %s, %s, %s\n", - d_INT, d_REL, d_CPL, d_NOM, d_ALG, d_RPN); + printf(" 2: %s, %s\n", d_INT, d_REL); + printf(" 1: %s, %s\n", d_INT, d_REL); + printf("-> 1: %s, %s\n\n", d_INT, d_REL); + + printf(" 2: %s, %s, %s, %s, %s\n", + d_INT, d_REL, d_NOM, d_ALG, d_RPN); + printf(" 1: %s, %s, %s, %s, %s\n", + d_INT, d_REL, d_NOM, d_ALG, d_RPN); printf("-> 1: %s, %s\n", d_ALG, d_RPN); return; @@ -1245,14 +1245,14 @@ instruction_min(struct_processus *s_etat printf("-> 2: %s, %s, %s\n", d_INT, d_REL, d_CPL); printf(" 1: %s\n\n", d_LST); - printf(" 2: %s, %s, %s\n", d_INT, d_REL, d_CPL); - printf(" 1: %s, %s, %s\n", d_INT, d_REL, d_CPL); - printf("-> 1: %s, %s, %s\n\n", d_INT, d_REL, d_CPL); - - printf(" 2: %s, %s, %s, %s, %s, %s\n", - d_INT, d_REL, d_CPL, d_NOM, d_ALG, d_RPN); - printf(" 1: %s, %s, %s, %s, %s, %s\n", - d_INT, d_REL, d_CPL, d_NOM, d_ALG, d_RPN); + printf(" 2: %s, %s\n", d_INT, d_REL); + printf(" 1: %s, %s\n", d_INT, d_REL); + printf("-> 1: %s, %s\n\n", d_INT, d_REL); + + printf(" 2: %s, %s, %s, %s, %s\n", + d_INT, d_REL, d_NOM, d_ALG, d_RPN); + printf(" 1: %s, %s, %s, %s, %s\n", + d_INT, d_REL, d_NOM, d_ALG, d_RPN); printf("-> 1: %s, %s\n", d_ALG, d_RPN); return;