summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjordi.saludes <jordi.saludes@upc.edu>2010-06-05 11:01:09 +0000
committerjordi.saludes <jordi.saludes@upc.edu>2010-06-05 11:01:09 +0000
commitaa7a254f6984b5d105399c87543660b8247be3ba (patch)
tree95a80fcdec1acf2ee8afd4df0007e0ca33aba3c0
parentdf98e9b4428a5896ca2e84b6f29c93e1f5a45d1b (diff)
Fixed c-bindings gfctest
-rw-r--r--contrib/c-bindings/build-gfctest.sh10
-rw-r--r--contrib/c-bindings/gfctest.c7
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 {