Przeglądaj źródła

Merge branch 'master' of github.com:IUCompilerCourse/Essentials-of-Compilation

Jeremy G. Siek 2 lat temu
rodzic
commit
ea411c0db5
3 zmienionych plików z 8 dodań i 6 usunięć
  1. 3 1
      .github/workflows/ci.yml
  2. 1 1
      book.tex
  3. 4 4
      defs.tex

+ 3 - 1
.github/workflows/ci.yml

@@ -1,4 +1,6 @@
-on: push
+on:
+  push:
+  pull_request:
 jobs:
     build:
         runs-on: ubuntu-latest

+ 1 - 1
book.tex

@@ -995,7 +995,7 @@ figure~\ref{fig:r0-concrete-syntax} and the abstract syntax for
   \itm{binaryop} &::= & \code{Add()} \MID \code{Sub()} \\
   \itm{unaryop} &::= & \code{USub()} \\
   \Exp{} &::=& \INT{\Int} \MID \READ{} \\
-        &\MID& \UNIOP{\itm{unaryop}}{\Exp} \MID  \BINOP{\itm{binaryop}}{\Exp}{\Exp}  \\
+        &\MID& \UNIOP{\itm{unaryop}}{\Exp} \MID  \BINOP{\Exp}{\itm{binaryop}}{\Exp}  \\
   \Stmt{} &::=& \PRINT{\Exp} \MID \EXPR{\Exp} 
 \end{array}
 }

+ 4 - 4
defs.tex

@@ -45,7 +45,7 @@
 \newcommand{\LangFunRefM}{\Lang_{\mathsf{FunRef}}} %F1
 \newcommand{\LangFunRefAlloc}{\ensuremath{\Lang^{\mathsf{Alloc}}_{\mathsf{FunRef}}}} %R'4
 \newcommand{\LangLam}{$\Lang_\lambda$} %R5
-\newcommand{\LangLamFunRef}{$\Lang_\lambda^{\mathsf{FunRef}}$} 
+\newcommand{\LangLamFunRef}{$\Lang_\lambda^{\mathsf{FunRef}}$}
 \newcommand{\LangLamM}{\ensuremath{\Lang_\lambda}} %R5
 \newcommand{\LangCLam}{$\CLang_{\mathsf{Clos}}$} %C4
 \newcommand{\LangCLamM}{\CLang_{\mathsf{Clos}}} %C4
@@ -208,9 +208,9 @@
 \newcommand{\READ}{{\key{Call(Name('input\_int'),[])}}}
 \newcommand{\CREAD}{\key{input\_int()}}
 \newcommand{\NEG}[1]{{\key{UnaryOp(USub(),} #1\code{)}}}
-\newcommand{\ADD}[2]{{\key{BinOp}\LP #1\code{,} \key{Add()}\key{,}#2\code{)}}}
-\newcommand{\ADDP}[2]{{\key{BinOp}\LP #1\code{,} \key{Add()}\key{,}#2\code{)}}}
-\newcommand{\SUB}[2]{{\key{BinOp}\LP \key{Sub()}\key{,}#1\code{,}#2\code{)}}}
+\newcommand{\ADD}[2]{{\key{BinOp}\LP #1\code{,}\key{Add()}\key{,}#2\code{)}}}
+\newcommand{\ADDP}[2]{{\key{BinOp}\LP #1\code{,}\key{Add()}\key{,}#2\code{)}}}
+\newcommand{\SUB}[2]{{\key{BinOp}\LP #1\code{,}\key{Sub()}\key{,}#2\code{)}}}
 \newcommand{\PRINT}[1]{{\key{Expr}\LP\key{Call}\LP\key{Name}\LP\key{'print'}\RP\key{,}\LS#1\RS\RP\RP}}
 \newcommand{\CPRINT}[1]{\key{print}\LP #1\RP}
 \newcommand{\EXPR}[1]{{\key{Expr}\LP #1\RP}}