From 03020b9f9687b552cba1caeeee17ca1300515072 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Wed, 8 Apr 2015 12:09:14 +0100 Subject: [PATCH] Build system bugfixes. Partially fixes #27 --- scripts/mk_util.py | 8 ++++---- scripts/update_api.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 6c8230f3b..547379aec 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -2810,19 +2810,19 @@ def mk_z3consts_ml(api_files): if name not in DeprecatedEnums: efile.write('(** %s *)\n' % name[3:]) efile.write('type %s =\n' % name[3:]) # strip Z3_ - for k, i in decls.iteritems(): + for k, i in decls.items(): efile.write(' | %s \n' % k[3:]) # strip Z3_ efile.write('\n') efile.write('(** Convert %s to int*)\n' % name[3:]) efile.write('let int_of_%s x : int =\n' % (name[3:])) # strip Z3_ efile.write(' match x with\n') - for k, i in decls.iteritems(): + for k, i in decls.items(): efile.write(' | %s -> %d\n' % (k[3:], i)) efile.write('\n') efile.write('(** Convert int to %s*)\n' % name[3:]) efile.write('let %s_of_int x : %s =\n' % (name[3:],name[3:])) # strip Z3_ efile.write(' match x with\n') - for k, i in decls.iteritems(): + for k, i in decls.items(): efile.write(' | %d -> %s\n' % (i, k[3:])) # use Z3.Exception? efile.write(' | _ -> raise (Failure "undefined enum value")\n\n') @@ -2888,7 +2888,7 @@ def mk_z3consts_ml(api_files): if name not in DeprecatedEnums: efile.write('(** %s *)\n' % name[3:]) efile.write('type %s =\n' % name[3:]) # strip Z3_ - for k, i in decls.iteritems(): + for k, i in decls.items(): efile.write(' | %s \n' % k[3:]) # strip Z3_ efile.write('\n') efile.write('(** Convert %s to int*)\n' % name[3:]) diff --git a/scripts/update_api.py b/scripts/update_api.py index 93800237e..e179043e2 100644 --- a/scripts/update_api.py +++ b/scripts/update_api.py @@ -1169,7 +1169,7 @@ def mk_ml(): ml_i.write('type ptr\n') ml_native.write('and z3_symbol = ptr\n') ml_i.write('and z3_symbol = ptr\n') - for k, v in Type2Str.iteritems(): + for k, v in Type2Str.items(): if is_obj(k): ml_native.write('and %s = ptr\n' % v.lower()) ml_i.write('and %s = ptr\n' % v.lower())