[paparazzi-commits] [4852] use expression parser from sw/lib/ocaml

[Pascal Brisset]

Revision: 4852
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4852
Author:   hecto
Date:     2010-04-21 16:16:13 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
 use expression parser from sw/lib/ocaml

Modified Paths:
--------------
    paparazzi3/trunk/sw/ground_segment/joystick/Makefile
    paparazzi3/trunk/sw/ground_segment/joystick/input2ivy.ml

Modified: paparazzi3/trunk/sw/ground_segment/joystick/Makefile
===================================================================
--- paparazzi3/trunk/sw/ground_segment/joystick/Makefile        2010-04-21 
14:58:30 UTC (rev 4851)
+++ paparazzi3/trunk/sw/ground_segment/joystick/Makefile        2010-04-21 
16:16:13 UTC (rev 4852)
@@ -47,7 +47,7 @@
        gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config 
glib-2.0 --libs`  `pcre-config --libs` -lglibivy
 
 input2ivy: usb_stick.o ml_usb_stick.o input2ivy.cmo
-       $(OCAMLC) $(OCAMLINCLUDES) -custom -o $@ unix.cma str.cma 
glibivy-ocaml.cma xml-light.cma lib-pprz.cma lablgtk.cma 
$(TOOLSDIR)/fp_syntax.cmo $(TOOLSDIR)/fp_lexer.cmo $(TOOLSDIR)/fp_parser.cmo 
$(TOOLSDIR)/fp_proc.cmo $^
+       $(OCAMLC) $(OCAMLINCLUDES) -custom -o $@ unix.cma str.cma 
glibivy-ocaml.cma xml-light.cma lib-pprz.cma lablgtk.cma 
$(TOOLSDIR)/fp_proc.cmo $^
 
 
 %.o : %.c

Modified: paparazzi3/trunk/sw/ground_segment/joystick/input2ivy.ml
===================================================================
--- paparazzi3/trunk/sw/ground_segment/joystick/input2ivy.ml    2010-04-21 
14:58:30 UTC (rev 4851)
+++ paparazzi3/trunk/sw/ground_segment/joystick/input2ivy.ml    2010-04-21 
16:16:13 UTC (rev 4852)
@@ -35,7 +35,7 @@
 module G = Pprz.Messages(struct let name = "ground" end)
 
 (** Syntax for expressions *)
-module Syntax = Fp_syntax (* From ../../tools/ *)
+module Syntax = Expr_syntax
 
 (** Hash table of name-index associations for the settings of the A/C *)
 let index_of_settings = Hashtbl.create 13