From: Jason Eisner <jason@cs.jhu.edu>
Date: Fri, 8 Aug 2014 20:49:42 +0000 (-0400)
Subject: Merge branch 'master' of github.com:nwf/dyna
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=27456266efaffe01082a664a733cce2ac153b434;p=dyna2

Merge branch 'master' of github.com:nwf/dyna

Conflicts:
	docs/sphinx/spec/index.rst
---

27456266efaffe01082a664a733cce2ac153b434
diff --cc docs/sphinx/spec/index.rst
index 83d4d98,f106425..3454520
--- a/docs/sphinx/spec/index.rst
+++ b/docs/sphinx/spec/index.rst
@@@ -497,28 -391,10 +497,13 @@@ Non-ground term
  Types
  =====
  
- Type declarations
- -----------------
- 
- .. todo:: old design at http://www.dyna.org/wiki/index.php?title=Term#Union_types
- 
- Typed variables
- ---------------
- 
- Co-inductive types
- ------------------
- 
- .. todo:: how do we deal with types for varargs and keyword args?
- 
- Possible future extensions
- --------------------------
- Guarded types?  Nonlinear types?  Parametric types?
+ .. todo::
  
 -   Discussion moved to :doc:`/spec/type-system`
 +Dynamic (non-const) types, and relation to intern table implementations.
  
 +Type coercion
 +=============
- 
++   Discussion moved to :doc:`/spec/type-system`
  
  Unification
  ===========