Merge branch 'pryor'

diff --git a/hints/assignment_7_hint_1.mdwn b/hints/assignment_7_hint_1.mdwn
index 6353e87..745eb99 100644 (file)
--- a/hints/assignment_7_hint_1.mdwn
+++ b/hints/assignment_7_hint_1.mdwn
@@ -12,3 +12,5 @@
 
 *      What does their <code>&Exists;x</code> correspond to in the framework we've been talking about?
 
+*      [More hints](/hints/assignment_7_hint_2).
+

diff --git a/hints/assignment_7_hint_2.mdwn b/hints/assignment_7_hint_2.mdwn
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/hints/assignment_7_hint_2.mdwn
@@ -0,0 +1 @@
+

diff --git a/upcoming_topics.mdwn b/upcoming_topics.mdwn
index 2faa4ed..b92a228 100644 (file)
--- a/upcoming_topics.mdwn
+++ b/upcoming_topics.mdwn
@@ -1,14 +1,5 @@
 This is very sketchy at this point, but it should give a sense of our intended scope.
 
-## Side-effects and mutation ##
-
-1.     What difference imperativity makes
-2.     Side-effects in a purely functional setting, via monads
-3.     [Phil/ling application]Semantics for DPL, using state monad
-       Groenendijk, Stokhof, and Veltman, "Coreference and modality"
-       in Shalom Lappin, ed. Handbook of Contemporary Semantic Theory (Blackwell, 1996)
-4.     Passing by reference
-5.     [Phil/ling application] Fine and Pryor on "coordinated contents" (see, e.g., [Hyper-Evaluativity](http://www.jimpryor.net/research/papers/Hyper-Evaluativity.txt))
 
 14.    Curry-Howard isomorphism between simply-typed lambda and intuitionistic propositional logic<p>
 15.    The types of continuations; continuations as first-class values

diff --git a/week9.mdwn b/week9.mdwn
index 2d08b80..17e4a87 100644 (file)
--- a/week9.mdwn
+++ b/week9.mdwn
@@ -15,3 +15,12 @@ loops instead of recursion
 before, order never mattered except to avoid divergence. Also, we've give up "referential transparency".
 
 
+## Side-effects and mutation ##
+
+1.     What difference imperativity makes
+2.     Side-effects in a purely functional setting, via monads
+3.     [Phil/ling application]Semantics for DPL, using state monad
+       Groenendijk, Stokhof, and Veltman, "Coreference and modality"
+       in Shalom Lappin, ed. Handbook of Contemporary Semantic Theory (Blackwell, 1996)
+4.     Passing by reference
+5.     [Phil/ling application] Fine and Pryor on "coordinated contents" (see, e.g., [Hyper-Evaluativity](http://www.jimpryor.net/research/papers/Hyper-Evaluativity.txt))