From: Joel Reymont <joelr1@gmail.com>
To: caml-list@inria.fr
Subject: Re: [Caml-list] fixing swig
Date: Wed, 29 Dec 2010 23:29:50 +0000 [thread overview]
Message-ID: <7ACC6D8D-0250-4025-A4F3-DD27717A8F2A@gmail.com> (raw)
In-Reply-To: <AANLkTinRd-KOLQJFyA5ChiEUrg0+CanKCYCfR=9zh8HS@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 567 bytes --]
The patch attached below almost does it. Example code still fails, e.g. this bit
---
let (xf,yf) = match _factor '((x to int),(y to int)) with
C_list [ C_int a ; C_int b ] -> a,b
| _ -> raise BadReturn
---
results in this error
---
File "example_prog.ml", line 19, characters 20-27:
Parse error: "with" expected after [sequence] (in [expr])
File "example_prog.ml", line 1, characters 0-1:
Error: Preprocessor error
---
I'll see if I can figure it out.
---
http://wagerlabs.com | @wagerlabs | http://www.linkedin.com/in/joelreymont
[-- Attachment #2: 0001-no-errors.patch --]
[-- Type: application/octet-stream, Size: 9052 bytes --]
From ab2da507db52e02805fb9bf8bcdef861f5b53b6f Mon Sep 17 00:00:00 2001
From: wagerlabs <joelr1@gmail.com>
Date: Wed, 29 Dec 2010 22:06:17 +0000
Subject: [PATCH] no errors
---
swigp4.ml | 91 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/swigp4.ml b/swigp4.ml
index ab29e6f..0c3e248 100644
--- a/swigp4.ml
+++ b/swigp4.ml
@@ -1,5 +1,8 @@
-open Pcaml ;;
+open Camlp4.PreCast
+open Camlp4.Sig
+open Syntax
+let _loc = Loc.ghost
let lap x y = x :: y
let c_ify e loc =
match e with
@@ -15,39 +18,39 @@ let mk_list args loc f =
match args with
[] -> <:expr< [] >>
| x :: xs ->
- (let loc = MLast.loc_of_expr x in
- <:expr< [ ($f x loc$) ] @ ($mk_list_inner xs loc f$) >>) in
+ (let loc = Ast.loc_of_expr x in
+ <:expr< [ ($f x _loc$) ] @ ($mk_list_inner xs loc f$) >>) in
match args with
[] -> <:expr< (Obj.magic C_void) >>
- | [ a ] -> <:expr< (Obj.magic $f a loc$) >>
+ | [ a ] -> <:expr< (Obj.magic $f a _loc$) >>
| _ -> <:expr< (Obj.magic (C_list ($mk_list_inner args loc f$))) >>
-EXTEND
+EXTEND Gram
expr:
[ [ e1 = expr ; "'" ; "[" ; e2 = expr ; "]" ->
- <:expr< (invoke $e1$) "[]" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "[]" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "->" ; l = LIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< (invoke $e1$) $str:l$ ($mk_list args loc c_ify$) >>
+ <:expr< (invoke $e1$) $str:l$ ($mk_list args _loc c_ify$) >>
| e1 = expr ; "->" ; u = UIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< (invoke $e1$) $str:u$ ($mk_list args loc c_ify$) >>
+ <:expr< (invoke $e1$) $str:u$ ($mk_list args _loc c_ify$) >>
| e1 = expr ; "->" ; s = expr LEVEL "simple" ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< (invoke $e1$) $s$ ($mk_list args loc c_ify$) >>
+ <:expr< (invoke $e1$) $s$ ($mk_list args _loc c_ify$) >>
| e1 = expr ; "'" ; "." ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< (invoke $e1$) "()" ($mk_list args loc c_ify$) >>
+ <:expr< (invoke $e1$) "()" ($mk_list args _loc c_ify$) >>
| e1 = expr ; "'" ; "->" ; l = LIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< (invoke ((invoke $e1$) "->" C_void)) $str:l$ ($mk_list args loc c_ify$) >>
+ <:expr< (invoke ((invoke $e1$) "->" C_void)) $str:l$ ($mk_list args _loc c_ify$) >>
| e1 = expr ; "'" ; "->" ; u = UIDENT ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< (invoke ((invoke $e1$) "->" C_void)) $str:u$ ($mk_list args loc c_ify$) >>
+ <:expr< (invoke ((invoke $e1$) "->" C_void)) $str:u$ ($mk_list args _loc c_ify$) >>
| e1 = expr ; "'" ; "->" ; s = expr LEVEL "simple" ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< (invoke ((invoke $e1$) "->" C_void)) $s$ ($mk_list args loc c_ify$) >>
+ <:expr< (invoke ((invoke $e1$) "->" C_void)) $s$ ($mk_list args _loc c_ify$) >>
| e1 = expr ; "'" ; "++" ->
<:expr< (invoke $e1$) "++" C_void >>
| e1 = expr ; "'" ; "--" ->
<:expr< (invoke $e1$) "--" C_void >>
| e1 = expr ; "'" ; "-" ; e2 = expr ->
- <:expr< (invoke $e1$) "-" (C_list [ $c_ify e2 loc$ ]) >>
- | e1 = expr ; "'" ; "+" ; e2 = expr -> <:expr< (invoke $e1$) "+" (C_list [ $c_ify e2 loc$ ]) >>
- | e1 = expr ; "'" ; "*" ; e2 = expr -> <:expr< (invoke $e1$) "*" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "-" (C_list [ $c_ify e2 _loc$ ]) >>
+ | e1 = expr ; "'" ; "+" ; e2 = expr -> <:expr< (invoke $e1$) "+" (C_list [ $c_ify e2 _loc$ ]) >>
+ | e1 = expr ; "'" ; "*" ; e2 = expr -> <:expr< (invoke $e1$) "*" (C_list [ $c_ify e2 _loc$ ]) >>
| "'" ; "&" ; e1 = expr ->
<:expr< (invoke $e1$) "&" C_void >>
| "'" ; "!" ; e1 = expr ->
@@ -55,64 +58,64 @@ EXTEND
| "'" ; "~" ; e1 = expr ->
<:expr< (invoke $e1$) "~" C_void >>
| e1 = expr ; "'" ; "/" ; e2 = expr ->
- <:expr< (invoke $e1$) "/" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "/" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "%" ; e2 = expr ->
- <:expr< (invoke $e1$) "%" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "%" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "lsl" ; e2 = expr ->
- <:expr< (invoke $e1$) ("<" ^ "<") (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) ("<" ^ "<") (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "lsr" ; e2 = expr ->
- <:expr< (invoke $e1$) (">" ^ ">") (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) (">" ^ ">") (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "<" ; e2 = expr ->
- <:expr< (invoke $e1$) "<" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "<" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "<=" ; e2 = expr ->
- <:expr< (invoke $e1$) "<=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "<=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; ">" ; e2 = expr ->
- <:expr< (invoke $e1$) ">" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) ">" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; ">=" ; e2 = expr ->
- <:expr< (invoke $e1$) ">=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) ">=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "==" ; e2 = expr ->
- <:expr< (invoke $e1$) "==" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "==" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "!=" ; e2 = expr ->
- <:expr< (invoke $e1$) "!=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "!=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "&" ; e2 = expr ->
- <:expr< (invoke $e1$) "&" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "&" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "^" ; e2 = expr ->
- <:expr< (invoke $e1$) "^" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "^" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "|" ; e2 = expr ->
- <:expr< (invoke $e1$) "|" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "|" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "&&" ; e2 = expr ->
- <:expr< (invoke $e1$) "&&" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "&&" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "||" ; e2 = expr ->
- <:expr< (invoke $e1$) "||" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "||" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "=" ; e2 = expr ->
- <:expr< (invoke $e1$) "=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "+=" ; e2 = expr ->
- <:expr< (invoke $e1$) "+=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "+=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "-=" ; e2 = expr ->
- <:expr< (invoke $e1$) "-=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "-=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "*=" ; e2 = expr ->
- <:expr< (invoke $e1$) "*=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "*=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "/=" ; e2 = expr ->
- <:expr< (invoke $e1$) "/=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "/=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "%=" ; e2 = expr ->
- <:expr< (invoke $e1$) "%=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "%=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "lsl" ; "=" ; e2 = expr ->
- <:expr< (invoke $e1$) ("<" ^ "<=") (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) ("<" ^ "<=") (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "lsr" ; "=" ; e2 = expr ->
- <:expr< (invoke $e1$) (">" ^ ">=") (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) (">" ^ ">=") (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "&=" ; e2 = expr ->
- <:expr< (invoke $e1$) "&=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "&=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "^=" ; e2 = expr ->
- <:expr< (invoke $e1$) "^=" (C_list [ $c_ify e2 loc$ ]) >>
+ <:expr< (invoke $e1$) "^=" (C_list [ $c_ify e2 _loc$ ]) >>
| e1 = expr ; "'" ; "|=" ; e2 = expr ->
- <:expr< (invoke $e1$) "|=" (C_list [ $c_ify e2 loc$ ]) >>
- | "'" ; e = expr -> c_ify e loc
+ <:expr< (invoke $e1$) "|=" (C_list [ $c_ify e2 _loc$ ]) >>
+ | "'" ; e = expr -> c_ify e _loc
| c = expr ; "as" ; id = LIDENT -> <:expr< $lid:"get_" ^ id$ $c$ >>
| c = expr ; "to" ; id = LIDENT -> <:expr< $uid:"C_" ^ id$ $c$ >>
| "`" ; "`" ; l = LIDENT -> <:expr< C_enum `$lid:l$ >>
| "`" ; "`" ; u = UIDENT -> <:expr< C_enum `$uid:u$ >>
| f = expr ; "'" ; "(" ; args = LIST0 (expr LEVEL "simple") SEP "," ; ")" ->
- <:expr< $f$ ($mk_list args loc c_ify$) >>
+ <:expr< $f$ ($mk_list args _loc c_ify$) >>
] ] ;
END ;;
--
1.7.3.1
next prev parent reply other threads:[~2010-12-29 23:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-29 0:22 Joel Reymont
2010-12-29 21:43 ` Hezekiah M. Carty
2010-12-29 21:47 ` Joel Reymont
2010-12-29 23:29 ` Joel Reymont [this message]
2011-01-02 19:31 ` Joel Reymont
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7ACC6D8D-0250-4025-A4F3-DD27717A8F2A@gmail.com \
--to=joelr1@gmail.com \
--cc=caml-list@inria.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox