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 97, Thu May 27 19:47:26 2010 UTC revision 378, Tue Oct 5 00:22:49 2010 UTC
# Line 21  Line 21 
21    \end{Rules}}    \end{Rules}}
22  \newcommand{\ActorDeclRULES}{  \newcommand{\ActorDeclRULES}{
23    \begin{Rules}{ActorDecl}    \begin{Rules}{ActorDecl}
24      \RHS{\kw{actor} \term{Id} \kw{(} \nt{Params} \kw{)} \kw{\{} \LISTGRP{\nt{VarDecl}} \LISTONEGRP{\nt{ActorMethod}} \kw{\}}}      \RHS{\kw{actor} \term{Id} \kw{(} \nt{Params} \kw{)} \kw{\{} \LISTGRP{\nt{ActorStateDecl}} \LISTONEGRP{\nt{ActorMethod}} \kw{\}}}
25    \end{Rules}}    \end{Rules}}
26  \newcommand{\ParamsRULES}{  \newcommand{\ParamsRULES}{
27    \begin{Rules}{Params}    \begin{Rules}{Params}
# Line 29  Line 29 
29    \end{Rules}}    \end{Rules}}
30  \newcommand{\ParamRULES}{  \newcommand{\ParamRULES}{
31    \begin{Rules}{Param}    \begin{Rules}{Param}
32      \RHS{\nt{Type} \term{Id}}      \RHS{\nt{ValueType} \term{Id}}
33      \end{Rules}}
34    \newcommand{\ActorStateDeclRULES}{
35      \begin{Rules}{ActorStateDecl}
36        \RHS{\OPT{\kw{output}} \nt{VarDecl}}
37    \end{Rules}}    \end{Rules}}
38  \newcommand{\ActorMethodRULES}{  \newcommand{\ActorMethodRULES}{
39    \begin{Rules}{ActorMethod}    \begin{Rules}{ActorMethod}
40      \RHS{\term{Id} \nt{Block}}      \RHS{\nt{MethodId} \nt{Block}}
41      \end{Rules}}
42    \newcommand{\MethodIdRULES}{
43      \begin{Rules}{MethodId}
44        \RHS{\kw{update}}
45        \RHS{\kw{stabilize}}
46        \RHS{\term{Id}}
47    \end{Rules}}    \end{Rules}}
48  \newcommand{\BlockRULES}{  \newcommand{\BlockRULES}{
49    \begin{Rules}{Block}    \begin{Rules}{Block}
# Line 56  Line 66 
66    \end{Rules}}    \end{Rules}}
67  \newcommand{\TypeRULES}{  \newcommand{\TypeRULES}{
68    \begin{Rules}{Type}    \begin{Rules}{Type}
69      \RHS{\kw{image} \kw{(} \nt{Dimension} \kw{)} \nt{Dimensions}}      \RHS{\nt{ValueType} \LISTGRP{\kw{[} \term{Int} \kw{]}}}
70      \RHS{\kw{field} \kw{\#} \nt{Dimension} \kw{(} \nt{Dimension} \kw{)} \nt{Dimensions}}      \RHS{\kw{image} \kw{(} \term{Int} \kw{)} \nt{Dimensions}}
71      \RHS{\kw{kernel} \kw{\#} \nt{Dimension}}      \RHS{\kw{field} \kw{\#} \term{Int} \kw{(} \term{Int} \kw{)} \nt{Dimensions}}
72      \RHS{\nt{ValueType} \LISTGRP{\kw{[} \nt{Dimension} \kw{]}}}      \RHS{\kw{kernel} \kw{\#} \term{Int}}
73      \end{Rules}}
74    \newcommand{\ValueTypeRULES}{
75      \begin{Rules}{ValueType}
76        \RHS{\kw{bool}}
77        \RHS{\kw{int}}
78        \RHS{\kw{string}}
79        \RHS{\kw{real}}
80        \RHS{\kw{vec2}}
81        \RHS{\kw{vec3}}
82        \RHS{\kw{vec4}}
83        \RHS{\kw{tensor} \nt{Dimensions}}
84      \end{Rules}}
85    \newcommand{\DimensionsRULES}{
86      \begin{Rules}{Dimensions}
87        \RHS{\kw{[} \OPTGRP{\nt{\term{Int}} \LISTGRP{\kw{,} \nt{\term{Int}}}} \kw{]}}
88    \end{Rules}}    \end{Rules}}
89  \newcommand{\CoordinationDeclRULES}{  \newcommand{\CoordinationDeclRULES}{
90    \begin{Rules}{CoordinationDecl}    \begin{Rules}{CoordinationDecl}
# Line 87  Line 112 
112    \end{Rules}}    \end{Rules}}
113  \newcommand{\ExprRULES}{  \newcommand{\ExprRULES}{
114    \begin{Rules}{Expr}    \begin{Rules}{Expr}
115        \RHS{\nt{TestExpr} \OPTGRP{\kw{if} \nt{Expr} \kw{else} \nt{Expr}}}
116      \end{Rules}}
117    \newcommand{\TestExprRULES}{
118      \begin{Rules}{TestExpr}
119      \RHS{\nt{AndExpr} \LISTGRP{\kw{||} \nt{AndExpr}}}      \RHS{\nt{AndExpr} \LISTGRP{\kw{||} \nt{AndExpr}}}
120    \end{Rules}}    \end{Rules}}
121  \newcommand{\AndExprRULES}{  \newcommand{\AndExprRULES}{
# Line 94  Line 123 
123      \RHS{\nt{CmpExpr} \LISTGRP{\kw{\&\&} \nt{CmpExpr}}}      \RHS{\nt{CmpExpr} \LISTGRP{\kw{\&\&} \nt{CmpExpr}}}
124    \end{Rules}}    \end{Rules}}
125  \newcommand{\CmpExprRULES}{  \newcommand{\CmpExprRULES}{
126    \begin{Rules}{AddExprCmpExpr}    \begin{Rules}{CmpExpr}
127      \RHS{\nt{AddExpr} \LISTGRP{\nt{CmpOp} \nt{AddExpr}}}      \RHS{\nt{AddExpr} \LISTGRP{\nt{CmpOp} \nt{AddExpr}}}
128    \end{Rules}}    \end{Rules}}
129  \newcommand{\AddExprRULES}{  \newcommand{\AddExprRULES}{
# Line 119  Line 148 
148  \newcommand{\AtomExpRULES}{  \newcommand{\AtomExpRULES}{
149    \begin{Rules}{AtomExp}    \begin{Rules}{AtomExp}
150      \RHS{\term{Id} \OPTGRP{\kw{(} \nt{Arguments} \kw{)}}}      \RHS{\term{Id} \OPTGRP{\kw{(} \nt{Arguments} \kw{)}}}
151      \RHS{\nt{ValueType} \kw{(} \nt{Arguments} \kw{)}}      \RHS{\kw{real} \kw{(} \nt{Expr} \kw{)}}
152        \RHS{\kw{[} \nt{Expr} \LISTGRP{\kw{,} \nt{Expr}} \kw{]}}
153      \RHS{\term{Int}}      \RHS{\term{Int}}
154      \RHS{\term{Float}}      \RHS{\term{Float}}
155      \RHS{\term{String}}      \RHS{\term{String}}
156      \RHS{\kw{(} \nt{Expr} \LISTGRP{\kw{,} \nt{Expr}} \kw{)}}      \RHS{\kw{(} \nt{Expr} \LISTGRP{\kw{,} \nt{Expr}} \kw{)}}
157      \RHS{\kw{$|$} \nt{Expr} \kw{$|$}}      \RHS{\kw{|} \nt{Expr} \kw{|}}
158    \end{Rules}}    \end{Rules}}
159  \newcommand{\ArgumentsRULES}{  \newcommand{\ArgumentsRULES}{
160    \begin{Rules}{Arguments}    \begin{Rules}{Arguments}
# Line 148  Line 178 
178    \begin{Rules}{MulOp}    \begin{Rules}{MulOp}
179      \RHS{\kw{*}}      \RHS{\kw{*}}
180      \RHS{\kw{/}}      \RHS{\kw{/}}
181    \end{Rules}}      \RHS{\kw{(*)}}
 \newcommand{\ValueTypeRULES}{  
   \begin{Rules}{ValueType}  
     \RHS{\kw{tensor} \nt{Dimensions}}  
     \RHS{\kw{vec2}}  
     \RHS{\kw{vec3}}  
     \RHS{\kw{vec4}}  
     \RHS{\kw{bool}}  
     \RHS{\kw{int}}  
     \RHS{\kw{real}}  
     \RHS{\kw{string}}  
   \end{Rules}}  
 \newcommand{\DimensionsRULES}{  
   \begin{Rules}{Dimensions}  
     \RHS{\kw{[} \OPTGRP{\nt{Dimension} \LISTGRP{\kw{,} \nt{Dimension}}} \kw{]}}  
   \end{Rules}}  
 \newcommand{\DimensionRULES}{  
   \begin{Rules}{Dimension}  
     \RHS{\term{Int}}  
182    \end{Rules}}    \end{Rules}}

Legend:
Removed from v.97  
changed lines
  Added in v.378

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