From 7ac7f14e80fd45bbdf0db62c05760a3bf8e80d48 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 1 Feb 2015 14:44:20 -0500 Subject: [PATCH 1/1] adjustments --- index.mdwn | 7 ++++++- topics_and_themes.mdwn | 25 ++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/index.mdwn b/index.mdwn index 9a696339..6b7f1d99 100644 --- a/index.mdwn +++ b/index.mdwn @@ -10,6 +10,8 @@ the Linguistics building at 10 Washington Place, in room 103 (front of the first One student session will be held every Wednesday from XX-YY at WHERE. --> +## [[Jump to content (lecture notes and more)|topics_and_themes.mdwn]] ## + ## Announcements ## @@ -38,7 +40,10 @@ week's homework, for instance, before the session. * Here is information about [[How to get the programming languages running on your computer]]. -* Here are [[Lecture notes for Week 1|topics/week1]]; and [[the homework|exercises/assignment1]]. There are also some [[advanced notes|topics/week1 advanced notes]]. +* Here are lecture notes for week 1: [[order|topics/week1 order]]; +[[the introduction to functional programming|topics/week1]], along +with [[the homework|exercises/assignment1]] and some [[advanced +notes|topics/week1 advanced notes]]. > Topics: Basics of Functional Programming diff --git a/topics_and_themes.mdwn b/topics_and_themes.mdwn index ab4a5338..6b4c55fb 100644 --- a/topics_and_themes.mdwn +++ b/topics_and_themes.mdwn @@ -1,4 +1,27 @@ -*Coming, please wait...* +# Topics # + +These topics are organized in two ways: by their content, and by the +week in which they were introduced. + +## Topics by content ## + +* [[Basics of functional programming|topics/week1]] + +* [[Order: static versus dynamic|topics/week1 order]] + +## Topics by week ## + +Week 1: + +* [[Order in programming languages and natural language|topics/order]] +This discussion considers conjunction in a language that recognized presupposition failure. +* [[Introduction to functional programming|topics/week1]] +Basics of functional programming: `let`, `case`, pattern matching, and +recursion. Definitions of factorial. +* [[Homework for week 1|exercises/assignment1]] +* [[Advanced notes|week1 advanced notes]] + +*More coming, please wait...*