michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6114 commits 3 branches 0 tags 28 MiB
Commit graph

181 commits

Author SHA1 Message Date
Leonardo de Moura
ebde1bcfad feat(library/unifier): option 'unifier.computation true' will force elaborator to always consider an extra case-split when the right-hand-side of a flex-rigid constraint is not in weak-head-normal-form 2014-09-09 09:27:26 -07:00
Leonardo de Moura
b9628842cf feat(library/unifier): remove mk_macro_imitation, we instead expand the macro before solving flex-rigid constraints 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-28 17:34:03 -07:00
Leonardo de Moura
641624a277 fix(library/unifier): bug in expand_rhs 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-28 14:35:11 -07:00
Leonardo de Moura
e303651dee refactor(library/unifier): cleanup mk_macro_imitation 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-28 13:19:19 -07:00
Leonardo de Moura
4c9723e5ed fix(library/unifier): assertion violation 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-26 09:07:34 -07:00
Leonardo de Moura
fbf13994d8 refactor(*): use + for concatenating format objects 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-24 09:35:25 -07:00
Leonardo de Moura
b746492ac8 refactor(library/simple_formatter): rename simple_formatter to print 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-22 10:32:08 -07:00
Leonardo de Moura
7d987df429 refactor(kernel/formatter): move simple_formatter to library 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-22 10:26:45 -07:00
Leonardo de Moura
937c465685 fix(library/unifier): too much reduction 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-21 21:37:51 -07:00
Leonardo de Moura
6cf73b51e2 fix(library/unifier): bug in occurs_check, the dependency may be eliminated by reducing term 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-21 17:56:18 -07:00
Leonardo de Moura
bb6dbe0e6f fix(library/unifier): we should preprocess choice constraints before we start solving any constraint, fixes #85 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-21 16:58:25 -07:00
Leonardo de Moura
e5057ed155 fix(library/unifier): remove incorrect assertion, a local constant may occur in the type of a metavariable that was not instantiated yet 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-20 18:22:43 -07:00
Leonardo de Moura
f5987b7bda refactor(library/unifier): make it easier to add new options to the unifier 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-20 17:30:08 -07:00
Leonardo de Moura
0450e81392 feat(library/unifier): allow computation when solving flex-rigid constraints 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-20 16:46:20 -07:00
Leonardo de Moura
fa342c8ea7 fix(library/unifier): missing set_conflict 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-20 16:46:19 -07:00
Leonardo de Moura
9588336c15 refactor(kernel/type_checker): remove "global" constraint buffer from type_checker, and use constraint_seq instead 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-20 16:46:19 -07:00
Leonardo de Moura
4cf3d32e0c chore(*): create alias for std::pair 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-20 16:46:19 -07:00
Leonardo de Moura
4a96fefd96 fix(library/unifier): bug in unifier priority queue 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-18 18:58:50 -07:00
Leonardo de Moura
1436212a34 fix(library/unifier): use depth-first search strategy for solving class-instance constraints 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-16 13:51:24 -07:00
Leonardo de Moura
562926e7ad refactor(kernel/instantiate): add functions instantiate_value_univ_params and instantiate_type_univ_params 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-12 17:40:30 -07:00
Leonardo de Moura
d47d326cef fix(library/unifier): bug in mk_imitiation_arg 
Remove bogus constraint
     cs.push_back(mk_eq_cnstr(mk_app(maux_type, locals), type, j, relax));
This constraint is incorrect because 'type' may contain local constants that are not in 'locals'.

We just rely on
   cs.push_back(mk_eq_cnstr(mk_app(maux, margs), arg, j, relax));
When maux is assigned, the system will inforce that its type (which is based on maux_type) must be type correct

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-11 15:44:23 -07:00
Leonardo de Moura
ee9be2837b refactor(library/unifier): remove redundant code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-09 15:04:34 -07:00
Leonardo de Moura
0af55beb56 perf(library/unifier): improve flex_rigid performance 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-09 08:07:15 -07:00
Leonardo de Moura
9d13f634f3 refactor(library/unifier): group flex_rigid case related methods in a functional object 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-08 16:44:59 -07:00
Leonardo de Moura
49070895d1 perf(library/unifier): improve 'assign' method, keep old version 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-07 22:29:56 -07:00
Leonardo de Moura
969afa8245 perf(library/unifier): improve check_imitation performance 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-07 18:28:23 -07:00
Leonardo de Moura
2486c483cf chore(kernel/error_msgs): change type mismatch error messages, closes #33 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-07 16:18:40 -07:00
Leonardo de Moura
9e6c5695be fix(library/unifier): make sure the imitation step is type correct, fix ensure_sufficient_args 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-07 16:09:45 -07:00
Leonardo de Moura
da616f69ea perf(library/unifier): do not explore branches that will trigger type errors 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-05 20:16:16 -07:00
Leonardo de Moura
bbc4380a52 fix(library/unifier): bug exposed by recent changes 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-05 19:02:30 -07:00
Leonardo de Moura
9cc2015caa feat(library/unifier): better error message for invalid local context 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-05 16:25:22 -07:00
Leonardo de Moura
d5bb7d45ec fix(library/unifier): constraint priority in the unifier, and remove hack from if.lean 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-04 13:58:47 -07:00
Leonardo de Moura
552be37d48 feat(library/hop_match): port higher-order (pattern) matcher to Lean 0.2, we still have to implement support for universe levels 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-03 16:03:58 -07:00
Leonardo de Moura
50b0c17092 feat(library/unifier): add more information in error messages due to type errors when assigning metavariables 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-03 09:49:30 -07:00
Leonardo de Moura
fbc4a7af3b feat(library/unifier): when unifier.expensive == true, then use only restrict higher-order unification (a fragment slightly more general than higher-order pattern matching) for solving class-instance constraints 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-02 14:30:25 -07:00
Leonardo de Moura
5e2185cfbe feat(library/unifier): postpone as much as possible universe constraints of the form ?m1 =?= max(l1, l2) and ?m1 =?= imax(l1, l2) where ?m1 occurs in the right hand side. When there is nothing else to be done, try to solve them by reducing to ?m1 = l1 and ?m1 = l2. 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-08-02 09:14:35 -07:00
Leonardo de Moura
de05c041c7 feat(library/unifier): add flag for enabling/disabling expensive extensions in the unifier 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-31 16:46:16 -07:00
Leonardo de Moura
f57fc33442 fix(library/unifier): bug that was making unifier miss solutions, and add a new case-split that tries to solve flex_rigid constraints by putting the rhs into whnf 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-31 16:46:16 -07:00
Leonardo de Moura
1a8a2b0811 refactor(library/unifier): process_flex_rigid method before adding yet another case split 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-31 12:25:35 -07:00
Leonardo de Moura
450131692a fix(library/converter): missing constraint on eta expansion 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-30 10:43:47 -07:00
Leonardo de Moura
936bb2744b fix(library/unifier): add a flag to sign that a choice constraint owns a metavariable ?m, that is, it has the right to assign ?m, and the unifier should postpone any other constraint that tries to assign ?m 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-29 17:32:55 -07:00
Leonardo de Moura
d1fe1286c0 fix(library/unifier): bug introduced today in consume_tc_cnstrs 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-27 17:16:30 -07:00
Leonardo de Moura
faee08591f fix(*): make sure elaborator and type_checker use the same "rules" for treating opaque definitions 
This is a big change because we have to store in constraints whether we can use the "relaxed" rules or not.
The "relaxed" case says that when type checking the value of an opaque definition we can treat other opaque definitions in the same module as transparent.

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-27 12:12:54 -07:00
Leonardo de Moura
23af5ab217 fix(library/unifier): eager whnf application 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-26 10:37:02 -07:00
Leonardo de Moura
556861c8d6 fix(library/unifier): remove incorrect assertion 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-26 07:52:10 -07:00
Leonardo de Moura
70c887a0bd fix(library/unifier): fix cryptic error message 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-25 21:10:32 -07:00
Leonardo de Moura
01cec1e1f1 fix(library/unifier): more bugs in the unifier 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-25 20:05:37 -07:00
Leonardo de Moura
7b84503133 fix(library/unifier): do not let a unification plugin to 'prioritize' a flex-flex constraint, and add missing case 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-25 15:03:57 -07:00
Leonardo de Moura
48b902dc37 feat(library/unifier): solve constraints of the form '(max l1 l2) =?= 0' and '(imax l1 l2) =?= 0' 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-24 20:30:51 -07:00
Leonardo de Moura
a533bf29da fix(library/unifier): broken optimization was missing solution 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-24 17:41:22 -07:00
Leonardo de Moura
2eb84c5f74 fix(library/unifier): make sure we do not miss dependency 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-24 11:38:43 -07:00
Leonardo de Moura
314c0822de fix(library/unifier): bugs exposed by recent changes 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-23 17:31:07 -07:00
Leonardo de Moura
13fe28dd1c perf(library/unifier): delay the instantiation of metavariables occurring in the types of local constants 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-23 14:31:30 -07:00
Leonardo de Moura
35481cb045 fix(library/unifier): potentially changing flag from l_false ==> l_undef 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-23 10:59:53 -07:00
Leonardo de Moura
301c395e59 perf(kernel/metavar): performance problem with occurs method 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-23 10:35:27 -07:00
Leonardo de Moura
61661478ad refactor(kernel/metavar): simplify substitution class, and remove dead code 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-23 10:03:03 -07:00
Leonardo de Moura
75005765d6 perf(library/unifier): add small performance improvement 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-22 17:58:40 -07:00
Leonardo de Moura
697bcf4b4f perf(library/unifier): improve performance of instantiate_meta method 
It provides a significant performance boost in some files.

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-22 16:24:07 -07:00
Leonardo de Moura
438a42d010 feat(library/unifier): improve error message when metavar assignment is type incorrect 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-20 00:19:32 +01:00
Leonardo de Moura
a78fb8f013 perf(library/unifier): minimize the number of constraints generated in the flex_rigid 'imitation' step 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-17 06:32:21 +01:00
Leonardo de Moura
6ddba9c276 fix(library/unifier): bug in process_delta 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-16 04:55:09 +01:00
Leonardo de Moura
c8849d42e9 fix(library/unifier): tolerate exceptions in the type_checker::infer method. This can happen since when we try projections we don't check whether they are type correct 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-16 03:05:19 +01:00
Leonardo de Moura
a18cf94d09 perf(library/unifier): minimize the use of instantiate_metavars 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-15 03:55:27 +01:00
Leonardo de Moura
29c7eeaa99 refactor(library/unifier): improve occurs_context_check 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-15 02:08:16 +01:00
Leonardo de Moura
614d8a768b fix(library/unifier): flex_rigid case (?M ...) =?= (f ...), where f is not a constant nor a local 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-13 02:46:04 +01:00
Leonardo de Moura
391e5e2bc2 perf(library/unifier): use d_instantiate_metavars 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-12 05:12:09 +01:00
Leonardo de Moura
9517f31a71 refactor(kernel/metavar): remove unnecessary functionality 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-12 04:45:50 +01:00
Leonardo de Moura
50f76fd138 perf(library/unifier): improve m_mvar_occs management 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-12 04:23:02 +01:00
Leonardo de Moura
c3e8e83e50 perf(library/unifier): simple optimization 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-11 20:21:41 +01:00
Leonardo de Moura
1230e942aa feat(library/unifier): handle 'first-order' flex-flex constraints 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-11 04:51:28 +01:00
Leonardo de Moura
405e57eb2d refactor(kernel/formatter): add formatter_factory, and simplify formatter interface 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-10 18:32:00 +01:00
Leonardo de Moura
b956ce68d2 feat(frontends/lean/elaborator): keep postponing delayed coercions until the type can be inferred 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-07 12:50:43 -07:00
Leonardo de Moura
fe448d47be feat(library/unifier): improve failure report 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-07 12:03:37 -07:00
Leonardo de Moura
48b28ad75c fix(library/unifier): missing test in flex_rigid 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-06 21:36:23 -07:00
Leonardo de Moura
dcf7cf00ff fix(*): bugs in the type checker, inductive datatypes, and unifier 
The bugs were indentified when performing the tiny change in the file
tests/lean/run/group.lean
 2014-07-06 18:44:56 -07:00
Leonardo de Moura
55894f01e3 feat(frontends/lean): add 'opaque_hint' command 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 18:58:20 -07:00
Leonardo de Moura
59755289e4 feat(library/unifier): case split on constraints of the form (f ...) =?= (f ...), where f can be unfolded, and there are metavariables in the arguments 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 15:52:40 -07:00
Leonardo de Moura
8aa217ea76 chore(library/unifier): update comments 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 11:06:13 -07:00
Leonardo de Moura
72bce91c18 refactor(library/unifier): move inductive datatype support to inductive_unifier_plugin 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 11:00:35 -07:00
Leonardo de Moura
ab929d7201 refactor(library/unifier): store the unifier_plugin in the environment 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 10:25:58 -07:00
Leonardo de Moura
a52c9f4e2b feat(library/unifier): add option 'unifier.unfold_opaque', remove option 'unifier.use_exceptions' (the user should not be able to change this) 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 09:43:16 -07:00
Leonardo de Moura
efabd2280c feat(library/unifier): allow unifier to unfold opaque definitions of the current module 
It is not clear whether this is a good idea or not. In some cases, it seems to do more harm than good.

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 00:46:03 -07:00
Leonardo de Moura
ac1585fd1a feat(library/unifier): divide constraints in clear groups 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-05 00:04:38 -07:00
Leonardo de Moura
f242971b55 feat(library/unifier): delay constraints where the lhs or rhs are of the form (?m ... (intro ...)) 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-04 23:36:31 -07:00
Leonardo de Moura
1e40525a0c fix(library/unifier): simple bug 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-04 21:15:32 -07:00
Leonardo de Moura
d7cb1952ae feat(kernel): simplify choice_fn, and make its interface closer to the unifier_plugin interface 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-04 12:47:33 -07:00
Leonardo de Moura
b94ce412ae fix(library/unifier): non-termination 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-04 10:32:01 -07:00
Leonardo de Moura
7fb2b0f6d8 feat(kernel): add method 'may_reduce_later' to normalizer_extension, and improve unifier 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 22:31:05 -07:00
Leonardo de Moura
110b622b83 feat(library/unifier): add support for unification constraints of the form "(elim ... (?m ...)) =?= t", where elim is an eliminator 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 20:41:51 -07:00
Leonardo de Moura
c854ad3d65 refactor(library/unifier): add is_def_eq alias 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 18:01:59 -07:00
Leonardo de Moura
aba4534acb feat(library/unifier): 'forget' justifications after finding a solution, the justifications are only needed inside the unifier (for implementing nonchronological backtracking) 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 14:14:07 -07:00
Leonardo de Moura
a009225435 feat(kernel/metavar): expose destructive assign 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 14:07:47 -07:00
Leonardo de Moura
079592c446 feat(library/unifier): eagerly apply substitution to improve quick failure 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 12:58:30 -07:00
Leonardo de Moura
c9cfb844f1 feat(library/unifier): add 'quick' failure 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 11:28:21 -07:00
Leonardo de Moura
dd96bb151b refactor(library/unifier): reduce the number unify procedure 'flavors' 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 11:15:43 -07:00
Leonardo de Moura
d63ccbcf94 fix(library/unifier): missing case 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 10:51:59 -07:00
Leonardo de Moura
c9994ca00c feat(library/unifier): when projecting give preference to most recent locals 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-03 09:01:29 -07:00
Leonardo de Moura
0f27856e4a feat(library/tactic): new apply tactic 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-07-02 13:14:50 -07:00
Leonardo de Moura
ad12abcdb4 fix(library/unifier): bug in process_eq_constraint 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-06-30 18:22:05 -07:00
Leonardo de Moura
cb000eda13 refactor(kernel): store binder_infor in local constants 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2014-06-30 11:37:46 -07:00