---

yaml
---
r: 15832
b: refs/heads/try
c: 564aa59
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 63210ecddb74fb601a17314c6866685d74fa89dc
+refs/heads/try: 564aa59a3ff1ec462f4be15041d89c2ac662f861
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/typeck.rs

@@ -30,21 +30,11 @@ independently:
   the `cx.tcache` table for later use
 
 - check: walks over function bodies and type checks them, inferring types for
-  local variables, type parameters, etc as necessary.  Temporary types (which
-  may contain references to type variables whose values have yet to be
-  inferred) for each item within a function are stored in a temporary table
-  inside of @fn_ctxt (function context).
+  local variables, type parameters, etc as necessary.
 
 - infer: finds the types to use for each type variable such that
-  all subtyping and assignment constraints are met
-
-- vtable: find and records the impls to use for each iface bound that
-  appears on a type parameter
-
-- writeback: writes the final types within a function body, replacing
-  type variables with their final inferred types.  These final types
-  are written into the `tcx.node_types` table, which should *never* contain
-  any reference to a type variable.
+  all subtyping and assignment constraints are met.  In essence, the check
+  module specifies the constraints, and the infer module solves them.
 
 */
 

branches/try/src/rustc/middle/typeck/check.rs

@@ -1,3 +1,46 @@
+/*
+
+# check.rs
+
+Within the check phase of type check, we check each item one at a time
+(bodies of function expressions are checked as part of the containing
+function).  Inference is used to supply types wherever they are
+unknown.
+
+By far the most complex case is checking the body of a function. This
+can be broken down into several distinct phases:
+
+- gather: creates type variables to represent the type of each local
+  variable and pattern binding.
+
+- main: the main pass does the lion's share of the work: it
+  determines the types of all expressions, resolves
+  methods, checks for most invalid conditions, and so forth.  In
+  some cases, where a type is unknown, it may create a type or region
+  variable and use that as the type of an expression.
+
+  In the process of checking, various constraints will be placed on
+  these type variables through the subtyping relationships requested
+  through the `demand` module.  The `typeck::infer` module is in charge
+  of resolving those constraints.
+
+- regionck: after main is complete, the regionck pass goes over all
+  types looking for regions and making sure that they did not escape
+  into places they are not in scope.  This may also influence the
+  final assignments of the various region variables if there is some
+  flexibility.
+
+- vtable: find and records the impls to use for each iface bound that
+  appears on a type parameter.
+
+- writeback: writes the final types within a function body, replacing
+  type variables with their final inferred types.  These final types
+  are written into the `tcx.node_types` table, which should *never* contain
+  any reference to a type variable.
+
+
+*/
+
 import astconv::{ast_conv, region_scope, empty_rscope, ast_ty_to_ty,
                  in_anon_rscope};
 import collect::{methods}; // ccx.to_ty()

branches/try/src/rustc/middle/typeck/demand.rs renamed to branches/try/src/rustc/middle/typeck/check/demand.rs

@@ -15,7 +15,6 @@ the region scope `r`.
 
 import util::ppaux;
 import syntax::print::pprust;
-import check::{fn_ctxt, methods, lookup_def};
 
 type rcx = @{fcx: @fn_ctxt, mut errors_reported: uint};
 type rvt = visit::vt<rcx>;

branches/try/src/rustc/middle/typeck/regionck.rs renamed to branches/try/src/rustc/middle/typeck/check/regionck.rs

@@ -54,14 +54,14 @@ mod middle {
     mod typeck {
         mod check {
             mod alt;
+            mod vtable;
+            mod writeback;
+            mod regionck;
+            mod demand;
         }
-        mod regionck;
-        mod demand;
-        mod infer;
         mod astconv;
+        mod infer;
         mod collect;
-        mod vtable;
-        mod writeback;
     }
     mod check_loop;
     mod check_alt;