Skip to content

Commit

Permalink
Update textbook
Browse files Browse the repository at this point in the history
  • Loading branch information
clarksmr committed Jan 16, 2025
1 parent cec9347 commit f8b7c18
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions _sources/chapters/preface/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ and set of packages. You can have many switches and, well, switch between them
this command:

```console
opam switch create cs3110-2024fa ocaml-base-compiler.5.2.0
opam switch create cs3110-2025sp ocaml-base-compiler.5.2.0
```

```{tip}
Expand Down Expand Up @@ -302,7 +302,7 @@ You should get output like this:

```
# switch compiler
→ cs3110-2024fa ocaml-base-compiler.5.2.0,ocaml-options-vanilla.1
→ cs3110-2025sp ocaml-base-compiler.5.2.0,ocaml-options-vanilla.1
```

There might be other lines if you happen to have done OCaml development before. There will be another column named "description" whose contents are not shown here. Double check the following:
Expand Down Expand Up @@ -388,9 +388,9 @@ issues:
`opam init` command. To fix it, follow the "redo" instructions below.

- **Is your switch listed?** Run `opam switch list` and make sure a switch named
`cs3110-2024fa` is listed, that it has the 5.2.0 compiler, and that it is the
`cs3110-2025sp` is listed, that it has the 5.2.0 compiler, and that it is the
active switch (which is indicated with an arrow beside it). If that switch is
present but not active, run `opam switch cs3110-2024fa` then see whether utop
present but not active, run `opam switch cs3110-2025sp` then see whether utop
works. If that switch is not present, follow the "redo" instructions below.

**Redo Instructions:** Remove the OPAM directory by running `rm -r ~/.opam`.
Expand Down Expand Up @@ -557,4 +557,4 @@ If you are a Cornell student, log in with your Microsoft account, not GitHub.
Enter your Cornell NetID email, e.g., `[email protected]`. That will take
you to Cornell's login site. Use the password associated with your NetID.

[liveshare]: https://learn.microsoft.com/en-us/visualstudio/liveshare/
[liveshare]: https://learn.microsoft.com/en-us/visualstudio/liveshare/
2 changes: 1 addition & 1 deletion _sources/cover.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ emphasis on semantics and software engineering. This book is the textbook for CS
3110 Data Structures and Functional Programming at Cornell University. A past
title of this book was "Functional Programming in OCaml".

**Fall 2024 Edition.**
**Spring 2025 Edition.**

**Videos.** There are over 200 YouTube videos embedded in this book.
They can be watched independently of reading the book. Start with
Expand Down
8 changes: 4 additions & 4 deletions chapters/preface/install.html
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ <h2>Create an OPAM Switch<a class="headerlink" href="#create-an-opam-switch" tit
and set of packages. You can have many switches and, well, switch between them
—whence the name. Create a switch for this semester’s CS 3110 by running
this command:</p>
<div class="highlight-console notranslate"><div class="highlight"><pre><span></span><span class="go">opam switch create cs3110-2024fa ocaml-base-compiler.5.2.0</span>
<div class="highlight-console notranslate"><div class="highlight"><pre><span></span><span class="go">opam switch create cs3110-2025sp ocaml-base-compiler.5.2.0</span>
</pre></div>
</div>
<div class="admonition tip">
Expand All @@ -786,7 +786,7 @@ <h2>Create an OPAM Switch<a class="headerlink" href="#create-an-opam-switch" tit
</div>
<p>You should get output like this:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span># switch compiler
→ cs3110-2024fa ocaml-base-compiler.5.2.0,ocaml-options-vanilla.1
→ cs3110-2025sp ocaml-base-compiler.5.2.0,ocaml-options-vanilla.1
</pre></div>
</div>
<p>There might be other lines if you happen to have done OCaml development before. There will be another column named “description” whose contents are not shown here. Double check the following:</p>
Expand Down Expand Up @@ -857,9 +857,9 @@ <h2>Double-Check OCaml<a class="headerlink" href="#double-check-ocaml" title="Pe
the <code class="docutils literal notranslate"><span class="pre">eval</span></code> command. Probably something went wrong earlier when you ran the
<code class="docutils literal notranslate"><span class="pre">opam</span> <span class="pre">init</span></code> command. To fix it, follow the “redo” instructions below.</p></li>
<li><p><strong>Is your switch listed?</strong> Run <code class="docutils literal notranslate"><span class="pre">opam</span> <span class="pre">switch</span> <span class="pre">list</span></code> and make sure a switch named
<code class="docutils literal notranslate"><span class="pre">cs3110-2024fa</span></code> is listed, that it has the 5.2.0 compiler, and that it is the
<code class="docutils literal notranslate"><span class="pre">cs3110-2025sp</span></code> is listed, that it has the 5.2.0 compiler, and that it is the
active switch (which is indicated with an arrow beside it). If that switch is
present but not active, run <code class="docutils literal notranslate"><span class="pre">opam</span> <span class="pre">switch</span> <span class="pre">cs3110-2024fa</span></code> then see whether utop
present but not active, run <code class="docutils literal notranslate"><span class="pre">opam</span> <span class="pre">switch</span> <span class="pre">cs3110-2025sp</span></code> then see whether utop
works. If that switch is not present, follow the “redo” instructions below.</p></li>
</ul>
<p><strong>Redo Instructions:</strong> Remove the OPAM directory by running <code class="docutils literal notranslate"><span class="pre">rm</span> <span class="pre">-r</span> <span class="pre">~/.opam</span></code>.
Expand Down
2 changes: 1 addition & 1 deletion cover.html
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ <h1>OCaml Programming: Correct + Efficient + Beautiful<a class="headerlink" href
emphasis on semantics and software engineering. This book is the textbook for CS
3110 Data Structures and Functional Programming at Cornell University. A past
title of this book was “Functional Programming in OCaml”.</p>
<p><strong>Fall 2024 Edition.</strong></p>
<p><strong>Spring 2025 Edition.</strong></p>
<p><strong>Videos.</strong> There are over 200 YouTube videos embedded in this book.
They can be watched independently of reading the book. Start with
this <a class="reference external" href="https://www.youtube.com/playlist?list=PLre5AT9JnKShBOPeuiD9b-I4XROIJhkIU">YouTube playlist</a>.</p>
Expand Down
Binary file modified ocaml_programming.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion searchindex.js

Large diffs are not rendered by default.

0 comments on commit f8b7c18

Please sign in to comment.