Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis12/doc/report/grammar-defs.tex
ViewVC logotype

Diff of /branches/vis12/doc/report/grammar-defs.tex

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1685, Sun Jan 22 15:23:36 2012 UTC revision 2275, Fri Mar 8 12:00:16 2013 UTC
# Line 12  Line 12 
12    \begin{Rules}{Declaration}    \begin{Rules}{Declaration}
13      \RHS{\nt{InputDecl}}      \RHS{\nt{InputDecl}}
14      \RHS{\nt{VarDecl}}      \RHS{\nt{VarDecl}}
15        \RHS{\nt{FuncDecl}}
16      \RHS{\nt{StrandDecl}}      \RHS{\nt{StrandDecl}}
17      \RHS{\nt{CoordinationDecl}}      \RHS{\nt{CoordinationDecl}}
18    \end{Rules}}    \end{Rules}}
# Line 19  Line 20 
20    \begin{Rules}{InputDecl}    \begin{Rules}{InputDecl}
21      \RHS{\kw{input} \nt{Type} \term{Id} \OPTGRP{\kw{=} \nt{Expr}} \kw{;}}      \RHS{\kw{input} \nt{Type} \term{Id} \OPTGRP{\kw{=} \nt{Expr}} \kw{;}}
22    \end{Rules}}    \end{Rules}}
23    \newcommand{\FuncDeclRULES}{
24      \begin{Rules}{FuncDecl}
25        \RHS{\kw{function} \nt{Type} \term{Id} \kw{(} \nt{Params} \kw{)} \kw{=} \nt{Expr} \kw{;}}
26        \RHS{\kw{function} \nt{Type} \term{Id} \kw{(} \nt{Params} \kw{)} \nt{Block}}
27      \end{Rules}}
28  \newcommand{\StrandDeclRULES}{  \newcommand{\StrandDeclRULES}{
29    \begin{Rules}{StrandDecl}    \begin{Rules}{StrandDecl}
30      \RHS{\kw{strand} \term{Id} \kw{(} \nt{Params} \kw{)} \kw{\{} \LISTGRP{\nt{StrandStateDecl}} \LISTONEGRP{\nt{StrandMethod}} \kw{\}}}      \RHS{\kw{strand} \term{Id} \kw{(} \nt{Params} \kw{)} \kw{\{} \LISTGRP{\nt{StrandStateDecl}} \LISTONEGRP{\nt{StrandMethod}} \kw{\}}}
# Line 55  Line 61 
61      \RHS{\nt{VarDecl}}      \RHS{\nt{VarDecl}}
62      \RHS{\kw{stabilize} \kw{;}}      \RHS{\kw{stabilize} \kw{;}}
63      \RHS{\kw{die} \kw{;}}      \RHS{\kw{die} \kw{;}}
64        \RHS{\kw{return} \nt{Expr} \kw{;}}
65      \RHS{\kw{new} \term{Id} \kw{(} \nt{Arguments} \kw{)} \kw{;}}      \RHS{\kw{new} \term{Id} \kw{(} \nt{Arguments} \kw{)} \kw{;}}
66      \RHS{\term{Id} \kw{=} \nt{Expr} \kw{;}}      \RHS{\term{Id} \kw{=} \nt{Expr} \kw{;}}
67      \RHS{\kw{if} \kw{(} \nt{Expr} \kw{)} \nt{Stmt} \kw{else} \nt{Stmt}}      \RHS{\kw{if} \kw{(} \nt{Expr} \kw{)} \nt{Stmt} \kw{else} \nt{Stmt}}
# Line 112  Line 119 
119    \end{Rules}}    \end{Rules}}
120  \newcommand{\ExprRULES}{  \newcommand{\ExprRULES}{
121    \begin{Rules}{Expr}    \begin{Rules}{Expr}
122      \RHS{\nt{TestExpr} \OPTGRP{\kw{if} \nt{Expr} \kw{else} \nt{Expr}}}      \RHS{\nt{OrExpr} \OPTGRP{\kw{if} \nt{Expr} \kw{else} \nt{Expr}}}
123    \end{Rules}}    \end{Rules}}
124  \newcommand{\TestExprRULES}{  \newcommand{\OrExprRULES}{
125    \begin{Rules}{TestExpr}    \begin{Rules}{OrExpr}
126      \RHS{\nt{AndExpr} \LISTGRP{\kw{||} \nt{AndExpr}}}      \RHS{\nt{AndExpr} \LISTGRP{\kw{||} \nt{AndExpr}}}
127    \end{Rules}}    \end{Rules}}
128  \newcommand{\AndExprRULES}{  \newcommand{\AndExprRULES}{

Legend:
Removed from v.1685  
changed lines
  Added in v.2275

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0