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 100, Fri May 28 14:45:44 2010 UTC
# Line 61  Line 61 
61      \RHS{\kw{kernel} \kw{\#} \nt{Dimension}}      \RHS{\kw{kernel} \kw{\#} \nt{Dimension}}
62      \RHS{\nt{ValueType} \LISTGRP{\kw{[} \nt{Dimension} \kw{]}}}      \RHS{\nt{ValueType} \LISTGRP{\kw{[} \nt{Dimension} \kw{]}}}
63    \end{Rules}}    \end{Rules}}
64    \newcommand{\ValueTypeRULES}{
65      \begin{Rules}{ValueType}
66        \RHS{\kw{tensor} \nt{Dimensions}}
67        \RHS{\kw{vec2}}
68        \RHS{\kw{vec3}}
69        \RHS{\kw{vec4}}
70        \RHS{\kw{bool}}
71        \RHS{\kw{int}}
72        \RHS{\kw{real}}
73        \RHS{\kw{string}}
74      \end{Rules}}
75    \newcommand{\DimensionsRULES}{
76      \begin{Rules}{Dimensions}
77        \RHS{\kw{[} \OPTGRP{\nt{Dimension} \LISTGRP{\kw{,} \nt{Dimension}}} \kw{]}}
78      \end{Rules}}
79    \newcommand{\DimensionRULES}{
80      \begin{Rules}{Dimension}
81        \RHS{\term{Int}}
82      \end{Rules}}
83  \newcommand{\CoordinationDeclRULES}{  \newcommand{\CoordinationDeclRULES}{
84    \begin{Rules}{CoordinationDecl}    \begin{Rules}{CoordinationDecl}
85      \RHS{\kw{initially} \nt{\GRP{\nt{Array} $\;|\;$ \nt{Collection}}} \kw{;}}      \RHS{\kw{initially} \nt{\GRP{\nt{Array} $\;|\;$ \nt{Collection}}} \kw{;}}
# Line 119  Line 138 
138  \newcommand{\AtomExpRULES}{  \newcommand{\AtomExpRULES}{
139    \begin{Rules}{AtomExp}    \begin{Rules}{AtomExp}
140      \RHS{\term{Id} \OPTGRP{\kw{(} \nt{Arguments} \kw{)}}}      \RHS{\term{Id} \OPTGRP{\kw{(} \nt{Arguments} \kw{)}}}
141      \RHS{\nt{ValueType} \kw{(} \nt{Arguments} \kw{)}}      \RHS{\kw{real} \kw{(} \nt{Expr} \kw{)}}
142        \RHS{\kw{[} \nt{Expr} \LISTGRP{\kw{,} \nt{Expr}} \kw{]}}
143      \RHS{\term{Int}}      \RHS{\term{Int}}
144      \RHS{\term{Float}}      \RHS{\term{Float}}
145      \RHS{\term{String}}      \RHS{\term{String}}
146      \RHS{\kw{(} \nt{Expr} \LISTGRP{\kw{,} \nt{Expr}} \kw{)}}      \RHS{\kw{(} \nt{Expr} \LISTGRP{\kw{,} \nt{Expr}} \kw{)}}
147      \RHS{\kw{$|$} \nt{Expr} \kw{$|$}}      \RHS{\kw{|} \nt{Expr} \kw{|}}
148    \end{Rules}}    \end{Rules}}
149  \newcommand{\ArgumentsRULES}{  \newcommand{\ArgumentsRULES}{
150    \begin{Rules}{Arguments}    \begin{Rules}{Arguments}
# Line 149  Line 169 
169      \RHS{\kw{*}}      \RHS{\kw{*}}
170      \RHS{\kw{/}}      \RHS{\kw{/}}
171    \end{Rules}}    \end{Rules}}
 \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}}  
   \end{Rules}}  

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

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