Skip to content

Commit

Permalink
[fix] qmlAstCons: not generating source names when where are potentia…
Browse files Browse the repository at this point in the history
…lly after renaming

it appears to somehow raise assertions later when you had db default values in several (non-linking) packages
  • Loading branch information
Valentin Gatien-Baron committed Jul 19, 2011
1 parent 4ecce30 commit 5fc8bb9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions libqmlcompil/qmlAstCons.ml
Expand Up @@ -356,14 +356,14 @@ struct

let make_code_elt expr =
let label = Annot.nolabel "QmlAstCons.make_code_elt" in
Q.NewVal (label, [(Ident.source "_", expr)]),
Q.NewVal (label, [(Ident.next "_", expr)]),
(function
| Q.NewVal (_, [(_, e)]) -> e
| _ -> failwith "QmlAstCons.UnValRec.make_code_elt.rebuilder")

let make_code_elt_maped expr =
let label = Annot.nolabel "QmlAstCons.make_code_elt_maped" in
Q.NewVal (label, [(Ident.source "_", expr)]),
Q.NewVal (label, [(Ident.next "_", expr)]),
(function
| Q.M_NewVal [(_, t)] -> t
| _ -> failwith "QmlAstCons.UnValRec.make_code_elt_maped.rebuilder")
Expand Down
6 changes: 5 additions & 1 deletion opa/pass_Typing.ml
Expand Up @@ -23,7 +23,11 @@ module S =
struct
type t = (QmlAst.ty, unit) QmlGenericScheme.tsc IdentMap.t
let pass = "pass_Typing"
let pp f _ = Format.pp_print_string f "<dummy>"
let pp f map =
IdentMap.iter
(fun k v ->
Format.fprintf f "@[<2>%s ->@ %a@]@\n" (Ident.to_string k) QmlPrint.pp#tsc v
) map
end

module R = ObjectFiles.Make(S)
Expand Down

0 comments on commit 5fc8bb9

Please sign in to comment.