From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 1 Dec 2009 19:52:05 +0000 (+0100)
Subject: Use \$ instead of just $ in lambda expressions.
X-Git-Tag: final-thesis~125
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=feee31da167a3c0505d2683d3e81e2597743f1a6;p=matthijs%2Fmaster-project%2Freport.git

Use \$ instead of just $ in lambda expressions.

This prevents vim's syntax highlighting from screwing up.
---

diff --git a/Chapters/Normalization.tex b/Chapters/Normalization.tex
index 0f6d0eb..e2f3a96 100644
--- a/Chapters/Normalization.tex
+++ b/Chapters/Normalization.tex
@@ -958,12 +958,12 @@
 
         \startbuffer[from]
         (+) :: Word -> Word -> Word
-        (+) = GHC.Num.(+) @Word $dNum
+        (+) = GHC.Num.(+) @Word \$dNum
         ~
         (+) a b
         \stopbuffer
         \startbuffer[to]
-        GHC.Num.(+) @ Alu.Word $dNum a b
+        GHC.Num.(+) @ Alu.Word \$dNum a b
         \stopbuffer
 
         \transexample{toplevelinline}{Top level binding inlining}{from}{to}
diff --git a/Chapters/Prototype.tex b/Chapters/Prototype.tex
index ac4cc93..139b93e 100644
--- a/Chapters/Prototype.tex
+++ b/Chapters/Prototype.tex
@@ -666,12 +666,12 @@
         instance declaration. This dictionary, as well as the binder
         introduced by a lambda that introduces a dictionary, have the
         predicate type as their type. These binders are usually named starting
-        with a \lam{$}. Usually the name of the type concerned is not
+        with a \lam{\$}. Usually the name of the type concerned is not
         reflected in the name of the dictionary, but the name of the type
         class is. The Haskell expression \hs{show True} thus becomes:
 
         \startlambda
-        show @Bool $dShow True
+        show @Bool \$dShow True
         \stoplambda
       \stopdesc
 
diff --git a/Utils/Shortcuts.tex b/Utils/Shortcuts.tex
index f7def73..5c46d37 100644
--- a/Utils/Shortcuts.tex
+++ b/Utils/Shortcuts.tex
@@ -33,4 +33,7 @@
 \def\VHDL{\small{VHDL}\autoinsertnextspace}
 \def\GHC{\small{GHC}\autoinsertnextspace}
 
+% TODO: Use this instead of $ to fool syntax highlighting
+\def\${\char36}
+
 % vim: set sw=2 sts=2 expandtab:
diff --git a/pret-lam.lua b/pret-lam.lua
index ba3829c..d44c5b3 100644
--- a/pret-lam.lua
+++ b/pret-lam.lua
@@ -28,7 +28,6 @@ local symbols = {
     ['*'] = {repr = '\\ast'},
     ['~'] = {repr = '\\HDLine[width=.20 * \\the\\textwidth]'},
     ['|'] = {repr = '\\char' .. utf.byte('|')},
-    ['$'] = {repr = '\\char' .. utf.byte('$')},
     -- Use ▶ from our roman font, since Iwona doesn't have the glyph
     ['▶'] = {repr = '{\\rm{}▶}'},
 }