From a1b6234bd4b6771a3d974e674918e67b2dade0dc Mon Sep 17 00:00:00 2001
From: "jordi.saludes" <jordi.saludes@upc.edu>
Date: Sat, 5 Jun 2010 11:01:09 +0000
Subject: [PATCH] Fixed c-bindings gfctest

---
 contrib/c-bindings/build-gfctest.sh | 10 ++++++----
 contrib/c-bindings/gfctest.c        |  7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/contrib/c-bindings/build-gfctest.sh b/contrib/c-bindings/build-gfctest.sh
index e0998c39b..f3d48f225 100644
--- a/contrib/c-bindings/build-gfctest.sh
+++ b/contrib/c-bindings/build-gfctest.sh
@@ -15,7 +15,9 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, see <http://www.gnu.org/licenses/>.
-
-gf --make ../../examples/tutorial/embedded/QueryEng.gf &&
-ghc --make -fglasgow-exts -O2 -no-hs-main $* -c PGFFFI.hs &&
-ghc --make -fglasgow-exts -O2 -no-hs-main $* gfctest.c gf_lexing.c PGFFFI.hs -o gfctest
+gf=../../dist/build/gf/gf
+src=../../src
+import=-i$src/runtime/haskell:$src/compiler
+$gf --make ../../examples/tutorial/embedded/QueryEng.gf &&
+ghc $import --make -fglasgow-exts -O2 -no-hs-main $* -c PGFFFI.hs &&
+ghc $import --make -fglasgow-exts -O2 -no-hs-main $* gfctest.c  PGFFFI.hs -o gfctest # gf_lexing.c
diff --git a/contrib/c-bindings/gfctest.c b/contrib/c-bindings/gfctest.c
index 1941788b3..4c3b5602f 100644
--- a/contrib/c-bindings/gfctest.c
+++ b/contrib/c-bindings/gfctest.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "pgf.h"
-#include "gf_lexing.h"
+// #include "gf_lexing.h"
 
 int main(int argc, char *argv[])
 {
@@ -27,9 +27,10 @@ int main(int argc, char *argv[])
   GF_PGF pgf = gf_readPGF("Query.pgf");
   GF_Language lang = gf_readLanguage("QueryEng");
   GF_Type cat = gf_startCat(pgf);
-  char *lexed = gf_stringOp("lextext")("Is 2 prime");
+//  char *lexed = gf_stringOp("lextext", "Is 2 prime");
+  char *lexed = "is 23 odd";
   GF_Tree *result = gf_parse(pgf, lang, cat, lexed);
-  free(lexed);
+  //free(lexed);
   GF_Tree *p = result;
   if (*p) {
     do {