Merge branch 'main' of gitlab.epfl.ch:lara/cs320

info/exercises/Makefile

+.PHONY = all clean
+
+OUT_DIR ?= $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
+DIRS := $(wildcard src/ex-??)
+
+EXPDFS := $(patsubst src/ex-%,ex-%.pdf,$(DIRS))
+SOLPDFS := $(patsubst src/ex-%,ex-%-sol.pdf,$(DIRS))
+
+all: $(EXPDFS) $(SOLPDFS)
+
+ex-%.pdf: src/ex-%/main.tex
+	cd src/ex-$* && \
+	lualatex -jobname=ex-$* "\def\ANSWERS{0}\input{main.tex}" && \
+	cp ex-$*.pdf $(OUT_DIR)/ex-$*.pdf
+
+ex-%-sol.pdf: src/ex-%/main.tex
+	cd src/ex-$* && \
+	lualatex -jobname=ex-$*-sol "\def\ANSWERS{1}\input{main.tex}" && \
+	cp ex-$*-sol.pdf $(OUT_DIR)/ex-$*-sol.pdf 
+
+clean:
+	rm -f $(EXPDFS) $(SOLPDFS)
+	for d in $(DIRS); do \
+		cd $$d && rm -f *.aux *.log *.out main.pdf; \
+	done

info/exercises/src/ex-01/ex/dfa.tex

@@ -211,8 +211,9 @@
   
       \item 
         As generalized regular expression (with complement): \((\Sigma^* aa
-        \Sigma^*)^c\). Without complement: \((b^*(ab^*)^*)^*\). This is the language
-        of words that contain no consecutive pair of \(a\)'s. In set-notation:
+        \Sigma^*)^c\). Without complement: \(b^*(ab^+)^*(a \mid \epsilon)\).
+        This is the language of words that contain no consecutive pair of
+        \(a\)'s. In set-notation:
         \begin{equation*}
           \{w \mid \forall i.\; 0 \leq i < |w| \land w_{(i)} = a \implies (i + 1 \geq |w| \lor w_{(i + 1)} \neq a)\}
         \end{equation*}

info/exercises/src/ex-01/ex/lexer.tex

@@ -125,8 +125,8 @@ lexer drops any \texttt{skip} tokens.
 
   \begin{solution}
     \begin{enumerate}
-      \item \texttt{[keyword("let"), id("x"), equal, number("5"), keyword("in"), id("x"), op("+"), number("3")]}
-      \item \texttt{[id("let"), number("5"), id("x2")]}
+      \item \texttt{[keyword("let"), id("x"), equal("="), number("5"), keyword("in"), id("x"), op("+"), number("3")]}
+      \item \texttt{[keyword("let"), number("5"), id("x2")]}
       \item \texttt{[id("xin")]}
       \item \texttt{[comp("=="), op(">")]}
       \item \texttt{[comp("<="), comp("=="), op(">"), comp("<="), equal("=")]}
@@ -144,10 +144,9 @@ lexer drops any \texttt{skip} tokens.
     There are many possible solutions. The key is to notice which tokens have
     overlapping prefixes.
 
-    An example is \texttt{letx1in}, which would be lexed as
-    \texttt{[keyword("let"), id("x1"), keyword("in")]} if we check acceptance in
-    order of priority, but as \texttt{[id("letx1in")]} if we run them in
-    parallel.
+    An example is \texttt{letx1}, which would be lexed as
+    \texttt{[keyword("let"), id("x1")]} if we check acceptance in order of
+    priority, but as \texttt{[id("letx1")]} if we run them in parallel.
   \end{solution}
 \end{exercise}
   

info/exercises/src/ex-01/main.tex

@@ -2,7 +2,11 @@
 
 \input{../macro}
 
-% \printanswers
+\ifdefined\ANSWERS
+  \if\ANSWERS1
+    \printanswers
+  \fi
+\fi
 
 \title{CS 320 \\ Computer Language Processing\\Exercises: Weeks 1 and 2}
 \author{}