Add a VHDL typing style (and some other fixes).

[matthijs/master-project/report.git] / Chapters / Prototype.tex

diff --git a/Chapters/Prototype.tex b/Chapters/Prototype.tex
index 101594bf2a9b4aaacbd210c1242fd968ed0f2fa7..7c4d2096f85e7b84fe63865d7d1194759c7734c3 100644 (file)
--- a/Chapters/Prototype.tex
+++ b/Chapters/Prototype.tex
@@ -825,9 +825,8 @@
       \stopdesc
 
       Using this set of types, all types in basic Haskell can be represented.
       \stopdesc
 
       Using this set of types, all types in basic Haskell can be represented.

-      

       \todo{Overview of polymorphism with more examples (or move examples
       \todo{Overview of polymorphism with more examples (or move examples

-      here)}.
+      here)}

         
   \section[sec:prototype:statetype]{State annotations in Haskell}
     As noted in \in{section}[sec:description:stateann], Cλash needs some
         
   \section[sec:prototype:statetype]{State annotations in Haskell}
     As noted in \in{section}[sec:description:stateann], Cλash needs some


@@ -1063,6 +1062,10 @@
       (state) variables} and \emph{substate variables}, which will be
       defined in the rules themselves.
 
       (state) variables} and \emph{substate variables}, which will be
       defined in the rules themselves.
 

+      These rules describe everything that can be done with state
+      variables and state-containing variables. Everything else is
+      invalid.
+

       \startdesc{State variables can appear as an argument.}
         \startlambda
           avg = λi.λspacked. ...
       \startdesc{State variables can appear as an argument.}
         \startlambda
           avg = λi.λspacked. ...


@@ -1393,9 +1396,9 @@
       \stopbuffer 
     
       \placeexample[][ex:AccStateVHDL]{\VHDL\ generated for acc from \in{example}[ex:AvgState]}
       \stopbuffer 
     
       \placeexample[][ex:AccStateVHDL]{\VHDL\ generated for acc from \in{example}[ex:AvgState]}

-          {\typebuffer[AccStateVHDL]}
+          {\typebuffervhdl{AccStateVHDL}}

       \placeexample[][ex:AvgStateVHDL]{\VHDL\ generated for avg from \in{example}[ex:AvgState]}
       \placeexample[][ex:AvgStateVHDL]{\VHDL\ generated for avg from \in{example}[ex:AvgState]}

-          {\typebuffer[AvgStateVHDL]}
+          {\typebuffervhdl{AvgStateVHDL}}

 %    \subsection{Initial state}
 %      How to specify the initial state? Cannot be done inside a hardware
 %      function, since the initial state is its own state argument for the first
 %    \subsection{Initial state}
 %      How to specify the initial state? Cannot be done inside a hardware
 %      function, since the initial state is its own state argument for the first