Skip to contentSkip to conversation

fix bytecode build of pyml

Cocci Christopher Zimmermann 3 participants 3 messages Jun 18, 2018 – Jun 20, 2018 Kbuild

lore
Share & tools
lore
#0 lore raw

Hi,

please consider inclusion of the following patches.

Christopher Zimmermann

Index: bundles/pyml/Makefile

pyml/Makefile renamed from pyml/Makefile.orig +2 -2
@@ -52,8 +52,8 @@ $(SRC_DIR)/pyml_compat.cmx: $(SRC_DIR)/pyml_compat.ml 
 $(SRC_DIR)/pyml_compat.cmo: $(SRC_DIR)/pyml_compat.ml $(SRC_DIR)/pyml_compat.cmi
 	$(OCAMLC_CMD) -c $< -o $@
 
-$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmx $(SRC_DIR)/generate.cmx
-	$(OCAMLOPT) $^ -o $@
+$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmo $(SRC_DIR)/generate.cmo
+	$(OCAMLC_CMD) $^ -o $@
 
 $(SRC_DIR)/generate.cmx: $(SRC_DIR)/generate.ml $(SRC_DIR)/pyml_compat.cmx
 	$(OCAMLOPT_CMD) -c $< -o $@

This does not set a default options as suggested in configure.ac, but overrides the user-provided setting.

Index: configure

configure renamed from configure.orig +0 -1
@@ -14416,7 +14416,6 @@ fi
 
 fi
 
-enable_opt="yes"
 
 
 if test "x$enable_opt" = xyes; then :

Index: parsing_c/unparse_c.ml

unparse_c.ml renamed from unparse_c.ml.orig +2 -2
@@ -2362,11 +2362,11 @@ let start_mark = function
 *)
 module String = struct
   let init n f =
-    let s = String.make n ' ' in
+    let s = Bytes.make n ' ' in
     for i = 0 to n - 1 do
       s.[i] <- f i
     done;
-    s
+    Bytes.unsafe_to_string s
 
   let map f s =
     init (String.length s) (fun i -> f s.[i])

Index: Makefile

Makefile renamed from Makefile.orig +1 -1
@@ -71,7 +71,7 @@ INCLUDEDIRSDEP=commons commons/ocamlextra \
  parsing_cocci parsing_c ocaml python engine popl09 extra \
  $(MAKELIBS)
 
-INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS)
+INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS) +num
 
 ##############################################################################
 # Generic variables

Index: parsing_c/Makefile

Makefile renamed from Makefile.orig +2 -2
@@ -42,9 +42,9 @@ LIBS=../commons/commons.cma ../globals/globals.cma \
 INCLUDESDEP= -I ../commons -I ../commons/ocamlextra \
   -I ../globals -I  ../parsing_cocci
 
-INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE)
+INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE) -I +num
 
-SYSLIBS= str.cma unix.cma num.cma
+SYSLIBS= str.cma unix.cma nums.cma
 
 ##############################################################################
 # Generic variables

Index: parsing_c/unparse_c.ml

unparse_c.ml renamed from unparse_c.ml.orig +2 -2
@@ -2362,11 +2362,11 @@ let start_mark = function
 *)
 module String = struct
   let init n f =
-    let s = String.make n ' ' in
+    let s = Bytes.make n ' ' in
     for i = 0 to n - 1 do
       s.[i] <- f i
     done;
-    s
+    Bytes.unsafe_to_string s
 
   let map f s =
     init (String.length s) (fun i -> f s.[i])

Index: tools/spgen/source/Makefile

spgen/source/Makefile renamed from spgen/source/Makefile.orig +0 -0
@@ -39,7 +39,7 @@ LIBS_OPT = $(LIBS:=.cmxa)
 
 INCLUDEDIRS= $(COCCIDIR)/commons $(COCCIDIR)/commons/ocamlextra \
 	$(COCCIDIR)/globals $(COCCIDIR)/parsing_cocci

$(COCCIDIR)/parsing_c \
- $(PCREDIR)
+ $(PCREDIR) +num

INCLUDES=$(INCLUDEDIRS:%=-I %)

Signature · 10 lines
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
2779 7F73 44FD 0736 B67A  C410 69EC 7922 34B4 2566
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://systeme.lip6.fr/pipermail/cocci/attachments/20180618/f06a28f9/attachment.asc>
#1 lore raw

Thank you for the feedback. Could you send a version with

Signed-off-by name <email>

See readme.txt.

Thanks,
julia

#2 lore raw
In reply to Christopher Zimmermann

Hi, Christopher.

Thank you for your patches! I adapted the first one; the other ones applied to former version of Coccinelle repo and are already fixed.

Christopher?:

Quoted 1 line

+++ bundles/pyml/Makefile

pyml/generate should be compiled by ocamlc if ocamlopt is not available, indeed. It is done this way in newer versions of pyml, so I updated pyml version in master and adapted your patch accordingly (see 7ab8f01).

Quoted 1 line

Index: configure

This file is generated by autoconf. The culprit line in configure.ac was fixed in master by commit 14945e1.

Quoted 1 line

Index: parsing_c/unparse_c.ml

These redefinitions of String.{init,map} are not present anymore in unparse_c.ml since commit 446dc66f.

Quoted 1 line

Index: Makefile

The nums module is no longer used (see commit 3c5dc62ba).

Cheers.
--
Thierry.

Christopher?:

Quoted 127 lines

Hi,

please consider inclusion of the following patches.

Christopher Zimmermann

Index: bundles/pyml/Makefile

pyml/Makefile renamed from pyml/Makefile.orig +2 -2
@@ -52,8 +52,8 @@ $(SRC_DIR)/pyml_compat.cmx: $(SRC_DIR)/pyml_compat.ml
 $(SRC_DIR)/pyml_compat.cmo: $(SRC_DIR)/pyml_compat.ml $(SRC_DIR)/pyml_compat.cmi
 	$(OCAMLC_CMD) -c $< -o $@
 
-$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmx $(SRC_DIR)/generate.cmx
-	$(OCAMLOPT) $^ -o $@
+$(SRC_DIR)/generate: $(SRC_DIR)/pyml_compat.cmo $(SRC_DIR)/generate.cmo
+	$(OCAMLC_CMD) $^ -o $@
 
 $(SRC_DIR)/generate.cmx: $(SRC_DIR)/generate.ml $(SRC_DIR)/pyml_compat.cmx
 	$(OCAMLOPT_CMD) -c $< -o $@

This does not set a default options as suggested in configure.ac, but overrides the user-provided setting.

Index: configure

configure renamed from configure.orig +0 -1
@@ -14416,7 +14416,6 @@ fi
 
 fi
 
-enable_opt="yes"
 
 
 if test "x$enable_opt" = xyes; then :

Index: parsing_c/unparse_c.ml

unparse_c.ml renamed from unparse_c.ml.orig +2 -2
@@ -2362,11 +2362,11 @@ let start_mark = function
 *)
 module String = struct
   let init n f =
-    let s = String.make n ' ' in
+    let s = Bytes.make n ' ' in
     for i = 0 to n - 1 do
       s.[i] <- f i
     done;
-    s
+    Bytes.unsafe_to_string s
 
   let map f s =
     init (String.length s) (fun i -> f s.[i])

Index: Makefile

Makefile renamed from Makefile.orig +1 -1
@@ -71,7 +71,7 @@ INCLUDEDIRSDEP=commons commons/ocamlextra \
  parsing_cocci parsing_c ocaml python engine popl09 extra \
  $(MAKELIBS)
 
-INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS)
+INCLUDEDIRS=$(INCLUDEDIRSDEP) $(PCREDIR) $(PARMAPDIR) $(INCLIBS) +num
 
 ##############################################################################
 # Generic variables

Index: parsing_c/Makefile

Makefile renamed from Makefile.orig +2 -2
@@ -42,9 +42,9 @@ LIBS=../commons/commons.cma ../globals/globals.cma \
 INCLUDESDEP= -I ../commons -I ../commons/ocamlextra \
   -I ../globals -I  ../parsing_cocci
 
-INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE)
+INCLUDES=$(INCLUDESDEP) $(TARZANINCLUDE) -I +num
 
-SYSLIBS= str.cma unix.cma num.cma
+SYSLIBS= str.cma unix.cma nums.cma
 
 ##############################################################################
 # Generic variables

Index: parsing_c/unparse_c.ml

unparse_c.ml renamed from unparse_c.ml.orig +2 -2
@@ -2362,11 +2362,11 @@ let start_mark = function
 *)
 module String = struct
   let init n f =
-    let s = String.make n ' ' in
+    let s = Bytes.make n ' ' in
     for i = 0 to n - 1 do
       s.[i] <- f i
     done;
-    s
+    Bytes.unsafe_to_string s
 
   let map f s =
     init (String.length s) (fun i -> f s.[i])

Index: tools/spgen/source/Makefile

spgen/source/Makefile renamed from spgen/source/Makefile.orig +1 -1
@@ -39,7 +39,7 @@ LIBS_OPT = $(LIBS:=.cmxa)
 
 INCLUDEDIRS= $(COCCIDIR)/commons $(COCCIDIR)/commons/ocamlextra \
 	$(COCCIDIR)/globals $(COCCIDIR)/parsing_cocci
 $(COCCIDIR)/parsing_c \
-	$(PCREDIR)
+	$(PCREDIR) +num
 
 INCLUDES=$(INCLUDEDIRS:%=-I %)