delete upcoming topics, tweak index/new_stuff

Signed-off-by: Jim Pryor <profjim@jimpryor.net>

diff --git a/cps.mdwn b/cps_and_continuation_operators.mdwn
similarity index 100%
rename from cps.mdwn
rename to cps_and_continuation_operators.mdwn

diff --git a/index.mdwn b/index.mdwn
index 10df427..5577167 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -79,15 +79,15 @@ preloaded is available at [[assignment 3 evaluator]].
 
 (30 Nov) Lecture notes for [[Week11]]; [[Assignment8]].
 
 
 (30 Nov) Lecture notes for [[Week11]]; [[Assignment8]].
 

->      Topics: [[Tree and List Zippers]]; [[Coroutines and Aborts]]; [[From List Zippers to Continuations]].
+>      Topics: [[Tree and List Zippers]]; [[Coroutines and Aborts]]; [[From List Zippers to Continuations]]

 
 

-(6 Dec) Lecture notes for [[Week12]]
+(6 Dec) Lecture notes for [[Week12]]; [[Assignment9]].

 
 

->      Topics: [[List Monad as Continuation Monad]]; [[Manipulating Trees with Monads]]; ...; [[Assignment9]].
+>      Topics: [[List Monad as Continuation Monad]]; [[Manipulating Trees with Monads]]; [[Monad Transformers]]

 
 

-(13 Dec) Lecture notes for Week13
+(13 Dec) Lecture notes for Week13; Assignment10

 
 

-[[Upcoming topics]]
+>      Topics: CPS and Continuation Operators; Curry-Howard

 
 [[Advanced Topics]]
 
 
 [[Advanced Topics]]
 

diff --git a/new_stuff.mdwn b/new_stuff.mdwn
index ba7e51a..2cad569 100644 (file)
--- a/new_stuff.mdwn
+++ b/new_stuff.mdwn
@@ -26,5 +26,41 @@ In progress:
 *      [[Curry-Howard]]
 *      [[Monad Transformers]]
 *      [[Assignment10]]
 *      [[Curry-Howard]]
 *      [[Monad Transformers]]
 *      [[Assignment10]]

-*      [[CPS]]
+*      [[CPS and Continuation Operators]]

 
 

+<!--
+
+from Upcoming Topics, now pointless (sniff...)
+
+
+14.    Curry-Howard isomorphism between simply-typed lambda and intuitionistic propositional logic<p>
+15.    The types of continuations; continuations as first-class values
+
+## Continuations ##
+
+0.     [Phil/ling application] Partee on whether NPs should be uniformly interpreted as generalized quantifiers, or instead "lifted" when necessary. Lifting = a CPS transform.
+1.     Using CPS to handle abortive computations (think: presupposition failure, expressives)
+2.     Using CPS to do other handy things, e.g., coroutines (cooperative threading)
+3.     Making evaluation order explicit with continuations
+4.     Delimited (quantifier scope) vs undelimited (expressives, presupposition) continuations
+5.     [Phil/ling application] [Barker/Shan on donkey anaphora](http://dx.doi.org/10.3765/sp.1.1)
+6.     The continuation monad
+
+## Preemptively parallel computing and linear logic ##
+
+1.     Basics of parallel programming: semaphores/mutexes
+2.     Contrasting "preemptive" parallelism to "cooperative" parallelism (coroutines, above)
+3.     Linear logic, "logical resource management"
+4.     [Phil/ling application] Barker on free choice, imperatives
+
+
+##Other##
+17.    [Phil/ling application] Expletives<p>
+18.    Some references:
+       * [de Groote on the lambda-mu calculus in linguistics](http://www.loria.fr/%7Edegroote/papers/amsterdam01.pdf)
+       * [on donkey anaphora and continuations](http://dx.doi.org/10.3765/sp.1.1)
+       * [Wadler on symmetric sequent calculi](http://homepages.inf.ed.ac.uk/wadler/papers/dual-reloaded/dual-reloaded.pdf)
+19.    Dependent types
+
+
+-->

diff --git a/upcoming_topics.mdwn b/upcoming_topics.mdwn
deleted file mode 100644 (file)
index b92a228..0000000
--- a/upcoming_topics.mdwn
+++ /dev/null
@@ -1,32 +0,0 @@
-This is very sketchy at this point, but it should give a sense of our intended scope.
-
-
-14.    Curry-Howard isomorphism between simply-typed lambda and intuitionistic propositional logic<p>
-15.    The types of continuations; continuations as first-class values
-
-## Continuations ##
-
-0.     [Phil/ling application] Partee on whether NPs should be uniformly interpreted as generalized quantifiers, or instead "lifted" when necessary. Lifting = a CPS transform.
-1.     Using CPS to handle abortive computations (think: presupposition failure, expressives)
-2.     Using CPS to do other handy things, e.g., coroutines (cooperative threading)
-3.     Making evaluation order explicit with continuations
-4.     Delimited (quantifier scope) vs undelimited (expressives, presupposition) continuations
-5.     [Phil/ling application] [Barker/Shan on donkey anaphora](http://dx.doi.org/10.3765/sp.1.1)
-6.     The continuation monad
-
-## Preemptively parallel computing and linear logic ##
-
-1.     Basics of parallel programming: semaphores/mutexes
-2.     Contrasting "preemptive" parallelism to "cooperative" parallelism (coroutines, above)
-3.     Linear logic, "logical resource management"
-4.     [Phil/ling application] Barker on free choice, imperatives
-
-
-##Other##
-17.    [Phil/ling application] Expletives<p>
-18.    Some references:
-       * [de Groote on the lambda-mu calculus in linguistics](http://www.loria.fr/%7Edegroote/papers/amsterdam01.pdf)
-       * [on donkey anaphora and continuations](http://dx.doi.org/10.3765/sp.1.1)
-       * [Wadler on symmetric sequent calculi](http://homepages.inf.ed.ac.uk/wadler/papers/dual-reloaded/dual-reloaded.pdf)
-19.    Dependent types
-