Skip to content

Commit

Permalink
2 fixes on syntax extension and dataframes
Browse files Browse the repository at this point in the history
- fixed generated code for the syntax extension (type variable was
  not positionned correctly)
- changed subsetting operator for dataframes and listings (the former
  would give incorrect results)
  • Loading branch information
pveber committed Oct 15, 2012
1 parent 75eecef commit 3f1bcae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/base/rbase.ml
Expand Up @@ -104,7 +104,7 @@ end

let listing r = new listing r

let subset2 = R.symbol ~generic: true "[[.data.frame"
let subset2 = R.symbol ~generic: true ".subset2"

class ['a] dataframe r = object (self)
inherit ['a] listing r
Expand Down
2 changes: 1 addition & 1 deletion src/syntax/pa_r.ml
Expand Up @@ -76,7 +76,7 @@ module Make (Syntax : Sig.Camlp4Syntax) = struct
let obj_type = fresh_type _loc in
let constr =
let y = random_var () in
<:expr< fun () -> let _ : Rbase.compound $obj_type$ = $lid:x$#compound in
<:expr< fun () -> let (_ : Rbase.compound (< .. > as $obj_type$)) = $lid:x$#compound in
fun ($lid:y$ : $obj_type$) -> ($lid:y$#$m$ : $comp_type$) >>
in
<:expr< let $lid:x$ = $e$ in
Expand Down

0 comments on commit 3f1bcae

Please sign in to comment.