diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2010-05-16 15:34:24 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2010-05-16 15:34:24 -0400 |
| commit | bee7344f8b4ce196b759132bddcd036caa3aaca2 (patch) | |
| tree | a87856f597a385b0dcd0541eecad1cc355221a61 /src | |
| parent | 986eed1b84de490b264d8eac48a9aa405ea8eec0 (diff) | |
Fix C-mangling of datatype names
Diffstat (limited to 'src')
| -rw-r--r-- | src/cjr_print.sml | 4 | ||||
| -rw-r--r-- | src/prim.sml | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/cjr_print.sml b/src/cjr_print.sml index f0038de6..06999dec 100644 --- a/src/cjr_print.sml +++ b/src/cjr_print.sml @@ -79,7 +79,7 @@ fun p_typ' par env (t, loc) = | TDatatype (Enum, n, _) => (box [string "enum", space, - string ("__uwe_" ^ #1 (E.lookupDatatype env n) ^ "_" ^ Int.toString n)] + string ("__uwe_" ^ ident (#1 (E.lookupDatatype env n)) ^ "_" ^ Int.toString n)] handle CjrEnv.UnboundNamed _ => string ("__uwd_UNBOUND__" ^ Int.toString n)) | TDatatype (Option, n, xncs) => (case ListUtil.search #3 (!xncs) of @@ -93,7 +93,7 @@ fun p_typ' par env (t, loc) = | TDatatype (Default, n, _) => (box [string "struct", space, - string ("__uwd_" ^ #1 (E.lookupDatatype env n) ^ "_" ^ Int.toString n ^ "*")] + string ("__uwd_" ^ ident (#1 (E.lookupDatatype env n)) ^ "_" ^ Int.toString n ^ "*")] handle CjrEnv.UnboundNamed _ => string ("__uwd_UNBOUND__" ^ Int.toString n)) | TFfi (m, x) => box [string "uw_", p_ident m, string "_", p_ident x] | TOption t => diff --git a/src/prim.sml b/src/prim.sml index 849518f4..d4471143 100644 --- a/src/prim.sml +++ b/src/prim.sml @@ -74,14 +74,12 @@ fun pad (n, ch, s) = else str ch ^ pad (n-1, ch, s) -val gccify = String.toCString - fun p_t_GCC t = case t of Int n => string (int2s n) | Float n => string (float2s n) - | String s => box [string "\"", string (gccify s), string "\""] - | Char ch => box [string "'", string (gccify (str ch)), string "'"] + | String s => box [string "\"", string (String.toCString s), string "\""] + | Char ch => box [string "'", string (Char.toCString ch), string "'"] fun equal x = case x of |