Changes in / [a3525c4:30a1f0c]

Location:

doc

Files:

• LaTeXmacros/lstlang.sty (modified) (3 diffs)
• theses/jiada_liang_MMath/relatedwork.tex (modified) (5 diffs)

doc/LaTeXmacros/lstlang.sty

@@ -8 +8 @@
 %% Created On       : Sat May 13 16:34:42 2017
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sat Mar  9 17:03:58 2024
-%% Update Count     : 41
+%% Last Modified On : Tue Mar 12 17:29:58 2024
+%% Update Count     : 42
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -99 +99 @@
 }
 
-\lstdefinelanguage{pseudo}{
-        morekeywords={string,uint,int,bool,float},
-        sensitive=true,
-        morecomment=[l]{//},
-        morecomment=[s]{/*}{*/},
-        morestring=[b]',
-        morestring=[b]",
-        morestring=[s]{`}{`},
-}
+\lstdefinelanguage{OCaml}%
+        {morekeywords={
+                and, as, asr, assert, begin, class, constraint do, done, downto, else, end, exception, external,
+                false, for, fun, function, functor, if, in, include, inherit, initializer, land, lazy, let, lor, lsl, lsr, lxor,
+                match, method, mod, module, open, mutable, new, nonrec, object, of, open, open!, or, private, rec,
+                sig, struct, then, to, true, try, type, val, virtual, when, while, with
+        },
+   sensitive,%
+   morecomment=[n]{(*}{*)},%
+   morestring=[d]"%
+}[keywords,comments,strings]%
 
 % CFA programming language, based on ANSI C (with some gcc additions)
@@ -135 +137 @@
 }
 
+% pseudo code
+\lstdefinelanguage{pseudo}{
+        morekeywords={string,uint,int,bool,float},
+        sensitive=true,
+        morecomment=[l]{//},
+        morecomment=[s]{/*}{*/},
+        morestring=[b]',
+        morestring=[b]",
+        morestring=[s]{`}{`},
+}
+
 % Local Variables: %
 % tab-width: 4 %

doc/theses/jiada_liang_MMath/relatedwork.tex

@@ -2463 +2463 @@
 
 \section{OCaml}
-\lstnewenvironment{ocaml}[1][]{\lstset{language=ML,escapechar=\$,morekeywords={match},moredelim=**[is][\color{red}]{@}{@},}\lstset{#1}}{}
+\lstnewenvironment{ocaml}[1][]{\lstset{language=OCaml,escapechar=\$,morekeywords={match},moredelim=**[is][\color{red}]{@}{@},}\lstset{#1}}{}
 
 OCaml~\cite{Ocaml} provides a tagged variant (union) type, where multiple heterogeneously-typed objects share the same storage.
@@ -2469 +2469 @@
 \begin{ocaml}
 type weekday = Mon | Tue | Wed | Thu | Fri | Sat | Sun
-let day : weekday = Mon                                 $\C{(* bind *)}$
+let day : weekday @= Mon@                               $\C{(* bind *)}$
 let take_class( d : weekday ) =
-        match d with                                            $\C{(* matching *)}$
+        @match@ d with                                          $\C{(* matching *)}$
                 Mon | Wed -> Printf.printf "CS442\n" |
                 Tue | Thu -> Printf.printf "CS343\n" |
@@ -2487 +2487 @@
 Each tag can have an associated heterogeneous type, with an n-ary constructor for creating a corresponding value.
 \begin{ocaml}
-type colour = Red | Green of string | Blue of int * float
+type colour = Red | Green of @string@ | Blue of @int * float@
 \end{ocaml}
-@colour@ is a summation of a nullary type, a unary product type of @string@, and a cross product of @int@ and @bool@.
-(Mathematically, a @Blue@ value is a Cartesian product of the @int@ type and the @bool@.)
+@colour@ is a summation of a nullary type, a unary product type of @string@, and a cross product of @int@ and @float@.
+(Mathematically, a @Blue@ value is a Cartesian product of the types @int@ type and @float@.)
 Hence, a variant type creates a sum of product of different types.
 \begin{ocaml}
-let c : colour = Red                                    $\C{(* 0-ary constructor *)}$
+let c = Red                                                             $\C{(* 0-ary constructor, set tag *)}$
 let _ = match c with Red -> Printf.printf "Red, "
-let c : colour = Green( "abc" )                 $\C{(* 1-ary constructor *)}$
+let c = Green( "abc" )                                  $\C{(* 1-ary constructor, set tag *)}$
 let _ = match c with Green g -> Printf.printf "%s, " g
-let c : colour = Blue( 1, 1.5 )                 $\C{(* 2-ary constructor *)}$
+let c = Blue( 1, 1.5 )                                  $\C{(* 2-ary constructor, set tag *)}$
 let _ = match c with Blue( i, f ) -> Printf.printf "%d %g\n" i f
 @Red, abc, 1 1.5@
@@ -2504 +2504 @@
 A variant type can have a recursive definition.
 \begin{ocaml}
-type stringList = Empty | Pair of string * stringList
+type @stringList@ = Empty | Pair of string * @stringList@
 \end{ocaml}
 which is a recursive sum of product of types, called an \Newterm{algebraic data-type}.
@@ -2517 +2517 @@
 Each recursion is counted to obtain the number of elements in the type.
 
-Note, the compiler statically guarantees that only the correct kind of type can be used in the \lstinline[language=ML]{match} statement.
-However, the tag is dynamically set on binding (and possible reset on assignment), so the \lstinline[language=ML]{match} statement is effectively doing RTTI to select the matching case clause.
+Note, the compiler statically guarantees that only the correct kind of type is used in the \lstinline[language=OCaml]{match} statement.
+However, the tag is dynamically set on binding (and possible reset on assignment), so a \lstinline[language=OCaml]{match} statement is effectively doing RTTI to select the matching case clause.
 Hence, a tagged variant has no notion of enumerabilty, and therefore is not a real enumeration, except for the simple pure (untyped) case.