Last (?) final bugfixes

2 files changed, 38 insertions, 20 deletions

diff --git a/lib/assembler.c b/lib/assembler.c
index 71f1b6c..c2802da 100644
--- a/lib/assembler.c
+++ b/lib/assembler.c
@@ -1860,6 +1860,15 @@ void asm_eof(FILE * f)
 					break;
 				case E_OPERATION:
 					fprintf(stderr, "Type operation.\n");
+					fprintf(stderr, "Affichage de l'expression:\n");
+					debug_print_expression(ttext->Expr);
+					fprintf(stderr, "-----\n");
+					if (ttext->Expr->op == OP_DIRECT) {
+						if (ttext->Expr->child->e_subtype == E_VALUE) {
+							a = ttext->Expr->child->avalue;
+							break;
+						}
+					}
 					if (ttext->Expr->op != OP_FUNC_CALL) {
 						exception(1, _("Can't evaluate expression for a direct value"));
 					}
@@ -1934,6 +1943,15 @@ void asm_eof(FILE * f)
 					break;
 				case E_OPERATION:
 					fprintf(stderr, "Type operation.\n");
+					fprintf(stderr, "Affichage de l'expression:\n");
+					debug_print_expression(tdata->Expr);
+					fprintf(stderr, "-----\n");
+					if (ttext->Expr->op == OP_DIRECT) {
+						if (ttext->Expr->child->e_subtype == E_VALUE) {
+							a = ttext->Expr->child->avalue;
+							break;
+						}
+					}
 					if (tdata->Expr->op != OP_FUNC_CALL) {
 						exception(1, _("Can't evaluate expression for a direct value"));
 					}
diff --git a/po/ProjetArchi.pot b/po/ProjetArchi.pot
index 1a3d23d..d23c660 100644
--- a/po/ProjetArchi.pot
+++ b/po/ProjetArchi.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-04-16 04:18+0200\n"
+"POT-Creation-Date: 2001-04-16 04:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Error writing file"
 msgstr ""
 
-#: lib/assembler.c:1808 lib/assembler.c:2098
+#: lib/assembler.c:1808 lib/assembler.c:2116
 msgid "Error reading file"
 msgstr ""
 
@@ -214,73 +214,73 @@ msgstr ""
 msgid "Dumping text segment"
 msgstr ""
 
-#: lib/assembler.c:1839 lib/assembler.c:1913 lib/assembler.c:1989
+#: lib/assembler.c:1839 lib/assembler.c:1922 lib/assembler.c:2007
 #, c-format
 msgid "Processing word number %i coming from line %i of the file %s."
 msgstr ""
 
-#: lib/assembler.c:1864 lib/assembler.c:1867 lib/assembler.c:1938
-#: lib/assembler.c:1941
+#: lib/assembler.c:1873 lib/assembler.c:1876 lib/assembler.c:1956
+#: lib/assembler.c:1959
 msgid "Can't evaluate expression for a direct value"
 msgstr ""
 
-#: lib/assembler.c:1870 lib/assembler.c:1944
+#: lib/assembler.c:1879 lib/assembler.c:1962
 msgid "Can only use the diff() function onto labels"
 msgstr ""
 
-#: lib/assembler.c:1875 lib/assembler.c:1879 lib/assembler.c:1949
-#: lib/assembler.c:1953
+#: lib/assembler.c:1884 lib/assembler.c:1888 lib/assembler.c:1967
+#: lib/assembler.c:1971
 msgid "Can only evaluate a diff on local symbols"
 msgstr ""
 
-#: lib/assembler.c:1883 lib/assembler.c:1957
+#: lib/assembler.c:1892 lib/assembler.c:1975
 msgid "Can only evaluate a diff on symbols from the same segment"
 msgstr ""
 
-#: lib/assembler.c:1889 lib/assembler.c:1963
+#: lib/assembler.c:1898 lib/assembler.c:1981
 msgid "Can't evaluate expression"
 msgstr ""
 
-#: lib/assembler.c:1911
+#: lib/assembler.c:1920
 msgid "Dumping data segment"
 msgstr ""
 
-#: lib/assembler.c:1987
+#: lib/assembler.c:2005
 msgid "Dumping bss segment"
 msgstr ""
 
-#: lib/assembler.c:2054
+#: lib/assembler.c:2072
 msgid "Loading file"
 msgstr ""
 
-#: lib/assembler.c:2055 lib/meta.c:516
+#: lib/assembler.c:2073 lib/meta.c:516
 #, c-format
 msgid "Opening file '%s'"
 msgstr ""
 
-#: lib/assembler.c:2063 lib/meta.c:524
+#: lib/assembler.c:2081 lib/meta.c:524
 msgid "Reading file"
 msgstr ""
 
-#: lib/assembler.c:2065 lib/meta.c:526
+#: lib/assembler.c:2083 lib/meta.c:526
 #, c-format
 msgid "Reading line %i"
 msgstr ""
 
-#: lib/assembler.c:2074
+#: lib/assembler.c:2092
 #, c-format
 msgid "Summering line %s"
 msgstr ""
 
-#: lib/assembler.c:2091
+#: lib/assembler.c:2109
 msgid "Opening output file"
 msgstr ""
 
-#: lib/assembler.c:2094
+#: lib/assembler.c:2112
 msgid "Error writing output file"
 msgstr ""
 
-#: lib/assembler.c:2100
+#: lib/assembler.c:2118
 msgid "Writing output file"
 msgstr ""