From e5d11cfa16a04a756080b2c80b31f32dd49bdad2 Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Mon, 16 Feb 2009 17:15:21 +0000
Subject: [PATCH] MYDDAS is too closely integreated to be a package.

---
 C/compiler.c                                            | 7 ++++---
 {packages/MYDDAS => MYDDAS}/myddas.h                    | 0
 {packages/MYDDAS => MYDDAS}/myddas_initialization.c     | 0
 {packages/MYDDAS => MYDDAS}/myddas_mysql.c              | 0
 {packages/MYDDAS => MYDDAS}/myddas_odbc.c               | 0
 {packages/MYDDAS => MYDDAS}/myddas_shared.c             | 0
 {packages/MYDDAS => MYDDAS}/myddas_statistics.c         | 0
 {packages/MYDDAS => MYDDAS}/myddas_statistics.h         | 0
 {packages/MYDDAS => MYDDAS}/myddas_statistics_structs.h | 0
 {packages/MYDDAS => MYDDAS}/myddas_structs.h            | 0
 {packages/MYDDAS => MYDDAS}/myddas_top_level.c          | 0
 {packages/MYDDAS => MYDDAS}/myddas_util.c               | 0
 {packages/MYDDAS => MYDDAS}/myddas_wkb.h                | 0
 {packages/MYDDAS => MYDDAS}/myddas_wkb2prolog.c         | 0
 {packages/MYDDAS => MYDDAS}/myddas_wkb2prolog.h         | 0
 15 files changed, 4 insertions(+), 3 deletions(-)
 rename {packages/MYDDAS => MYDDAS}/myddas.h (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_initialization.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_mysql.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_odbc.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_shared.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_statistics.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_statistics.h (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_statistics_structs.h (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_structs.h (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_top_level.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_util.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_wkb.h (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_wkb2prolog.c (100%)
 rename {packages/MYDDAS => MYDDAS}/myddas_wkb2prolog.h (100%)

diff --git a/C/compiler.c b/C/compiler.c
index 1529072fe..3361cc97d 100644
--- a/C/compiler.c
+++ b/C/compiler.c
@@ -882,12 +882,13 @@ c_eq(Term t1, Term t2, compiler_struct *cglobs)
     c_var(t1, v, 0, 0, cglobs);
     cglobs->onhead = FALSE;    
   } else {
-    c_var(t1, 0, 0, 0, cglobs);
+    Int v = --cglobs->tmpreg;
+    c_var(t1, v, 0, 0, cglobs);
     cglobs->onhead = TRUE;
     if (IsVarTerm(t2)) {
-      c_var(t2, 0, 0, 0, cglobs);
+      c_var(t2, v, 0, 0, cglobs);
     } else {
-      c_arg(0, t2, 0, 0, cglobs);
+      c_arg(v, t2, 0, 0, cglobs);
     }
     cglobs->onhead = FALSE;
   }
diff --git a/packages/MYDDAS/myddas.h b/MYDDAS/myddas.h
similarity index 100%
rename from packages/MYDDAS/myddas.h
rename to MYDDAS/myddas.h
diff --git a/packages/MYDDAS/myddas_initialization.c b/MYDDAS/myddas_initialization.c
similarity index 100%
rename from packages/MYDDAS/myddas_initialization.c
rename to MYDDAS/myddas_initialization.c
diff --git a/packages/MYDDAS/myddas_mysql.c b/MYDDAS/myddas_mysql.c
similarity index 100%
rename from packages/MYDDAS/myddas_mysql.c
rename to MYDDAS/myddas_mysql.c
diff --git a/packages/MYDDAS/myddas_odbc.c b/MYDDAS/myddas_odbc.c
similarity index 100%
rename from packages/MYDDAS/myddas_odbc.c
rename to MYDDAS/myddas_odbc.c
diff --git a/packages/MYDDAS/myddas_shared.c b/MYDDAS/myddas_shared.c
similarity index 100%
rename from packages/MYDDAS/myddas_shared.c
rename to MYDDAS/myddas_shared.c
diff --git a/packages/MYDDAS/myddas_statistics.c b/MYDDAS/myddas_statistics.c
similarity index 100%
rename from packages/MYDDAS/myddas_statistics.c
rename to MYDDAS/myddas_statistics.c
diff --git a/packages/MYDDAS/myddas_statistics.h b/MYDDAS/myddas_statistics.h
similarity index 100%
rename from packages/MYDDAS/myddas_statistics.h
rename to MYDDAS/myddas_statistics.h
diff --git a/packages/MYDDAS/myddas_statistics_structs.h b/MYDDAS/myddas_statistics_structs.h
similarity index 100%
rename from packages/MYDDAS/myddas_statistics_structs.h
rename to MYDDAS/myddas_statistics_structs.h
diff --git a/packages/MYDDAS/myddas_structs.h b/MYDDAS/myddas_structs.h
similarity index 100%
rename from packages/MYDDAS/myddas_structs.h
rename to MYDDAS/myddas_structs.h
diff --git a/packages/MYDDAS/myddas_top_level.c b/MYDDAS/myddas_top_level.c
similarity index 100%
rename from packages/MYDDAS/myddas_top_level.c
rename to MYDDAS/myddas_top_level.c
diff --git a/packages/MYDDAS/myddas_util.c b/MYDDAS/myddas_util.c
similarity index 100%
rename from packages/MYDDAS/myddas_util.c
rename to MYDDAS/myddas_util.c
diff --git a/packages/MYDDAS/myddas_wkb.h b/MYDDAS/myddas_wkb.h
similarity index 100%
rename from packages/MYDDAS/myddas_wkb.h
rename to MYDDAS/myddas_wkb.h
diff --git a/packages/MYDDAS/myddas_wkb2prolog.c b/MYDDAS/myddas_wkb2prolog.c
similarity index 100%
rename from packages/MYDDAS/myddas_wkb2prolog.c
rename to MYDDAS/myddas_wkb2prolog.c
diff --git a/packages/MYDDAS/myddas_wkb2prolog.h b/MYDDAS/myddas_wkb2prolog.h
similarity index 100%
rename from packages/MYDDAS/myddas_wkb2prolog.h
rename to MYDDAS/myddas_wkb2prolog.h