|
|
@@ -16882,7 +16882,7 @@ class InterpLdyn(InterpLlambda):
|
|
|
if l.tag == r.tag:
|
|
|
return self.tag(self.interp_cmp(cmp)(l.value, r.value))
|
|
|
else:
|
|
|
- raise Exception('interp Compare unexpected ' \
|
|
|
+ raise Exception('interp Compare unexpected '
|
|
|
+ repr(l) + ' ' + repr(r))
|
|
|
case Subscript(tup, index, Load()):
|
|
|
t = self.interp_exp(tup, env)
|
|
|
@@ -17021,7 +17021,8 @@ class InterpLdyn(InterpLlambda):
|
|
|
case Tagged(val, tag) if tag == expected_tag:
|
|
|
return val
|
|
|
case _:
|
|
|
- raise Exception('expected Tagged value with ' + expected_tag + ', not ' + ' ' + repr(v))
|
|
|
+ raise Exception('expected Tagged value with '
|
|
|
+ + expected_tag + ', not ' + ' ' + repr(v))
|
|
|
|
|
|
def apply_fun(self, fun, args, e):
|
|
|
f = self.untag(fun, 'function', e)
|
|
|
@@ -17393,7 +17394,7 @@ class InterpLany(InterpLlambda):
|
|
|
case Tagged(val, tag) if self.type_to_tag(typ) == tag:
|
|
|
return val
|
|
|
case _:
|
|
|
- raise Exception('interp project to ' + repr(typ) \
|
|
|
+ raise Exception('interp project to ' + repr(typ)
|
|
|
+ ' unexpected ' + repr(v))
|
|
|
case Call(Name('any_tuple_load'), [tup, index]):
|
|
|
tv = self.interp_exp(tup, env)
|
|
|
@@ -17659,8 +17660,8 @@ $\Rightarrow$
|
|
|
\end{tabular}
|
|
|
\fi}
|
|
|
{\if\edition\pythonEd
|
|
|
-\begin{tabular}{|lll|} \hline
|
|
|
-\begin{minipage}{0.22\textwidth}
|
|
|
+\hspace{-0.8em}\begin{tabular}{|lll|} \hline
|
|
|
+\begin{minipage}{0.23\textwidth}
|
|
|
\begin{lstlisting}
|
|
|
True
|
|
|
\end{lstlisting}
|
|
|
@@ -17674,7 +17675,7 @@ Inject(True, BoolType())
|
|
|
\end{lstlisting}
|
|
|
\end{minipage}
|
|
|
\\[2ex]\hline
|
|
|
-\begin{minipage}{0.22\textwidth}
|
|
|
+\begin{minipage}{0.23\textwidth}
|
|
|
\begin{lstlisting}
|
|
|
|$e_1$| + |$e_2$|
|
|
|
\end{lstlisting}
|
|
|
@@ -17690,7 +17691,7 @@ Inject(Project(|$e'_1$|, IntType())
|
|
|
\end{lstlisting}
|
|
|
\end{minipage}
|
|
|
\\[2ex]\hline
|
|
|
-\begin{minipage}{0.22\textwidth}
|
|
|
+\begin{minipage}{0.23\textwidth}
|
|
|
\begin{lstlisting}
|
|
|
lambda |$x_1 \ldots x_n$|: |$e$|
|
|
|
\end{lstlisting}
|
|
|
@@ -17705,7 +17706,7 @@ Inject(Lambda([(|$x_1$|,AnyType),|$\ldots$|,(|$x_n$|,AnyType)], |$e'$|)
|
|
|
\end{lstlisting}
|
|
|
\end{minipage}
|
|
|
\\[2ex]\hline
|
|
|
-\begin{minipage}{0.22\textwidth}
|
|
|
+\begin{minipage}{0.23\textwidth}
|
|
|
\begin{lstlisting}
|
|
|
|$e_0$|(|$e_1 \ldots e_n$|)
|
|
|
\end{lstlisting}
|
|
|
@@ -17720,7 +17721,7 @@ Call(Project(|$e'_0$|, FunctionType([AnyType(),|$\ldots$|],
|
|
|
\end{lstlisting}
|
|
|
\end{minipage}
|
|
|
\\[2ex]\hline
|
|
|
-\begin{minipage}{0.22\textwidth}
|
|
|
+\begin{minipage}{0.23\textwidth}
|
|
|
\begin{lstlisting}
|
|
|
|$e_1$|[|$e_2$|]
|
|
|
\end{lstlisting}
|
|
|
@@ -17733,7 +17734,7 @@ $\Rightarrow$
|
|
|
Call(Name('any_tuple_load'),[|$e_1'$|, |$e_2'$|])
|
|
|
\end{lstlisting}
|
|
|
\end{minipage}
|
|
|
-%% \begin{minipage}{0.22\textwidth}
|
|
|
+%% \begin{minipage}{0.23\textwidth}
|
|
|
%% \begin{lstlisting}
|
|
|
%% |$e_2$| if |$e_1$| else |$e_3$|
|
|
|
%% \end{lstlisting}
|
|
|
@@ -17747,7 +17748,7 @@ Call(Name('any_tuple_load'),[|$e_1'$|, |$e_2'$|])
|
|
|
%% \end{lstlisting}
|
|
|
%% \end{minipage}
|
|
|
%% \\[2ex]\hline
|
|
|
-%% \begin{minipage}{0.22\textwidth}
|
|
|
+%% \begin{minipage}{0.23\textwidth}
|
|
|
%% \begin{lstlisting}
|
|
|
%% (eq? |$e_1$| |$e_2$|)
|
|
|
%% \end{lstlisting}
|
|
|
@@ -17761,7 +17762,7 @@ Call(Name('any_tuple_load'),[|$e_1'$|, |$e_2'$|])
|
|
|
%% \end{lstlisting}
|
|
|
%% \end{minipage}
|
|
|
%% \\[2ex]\hline
|
|
|
-%% \begin{minipage}{0.22\textwidth}
|
|
|
+%% \begin{minipage}{0.23\textwidth}
|
|
|
%% \begin{lstlisting}
|
|
|
%% (not |$e_1$|)
|
|
|
%% \end{lstlisting}
|
|
|
@@ -17776,6 +17777,7 @@ Call(Name('any_tuple_load'),[|$e_1'$|, |$e_2'$|])
|
|
|
%% \end{lstlisting}
|
|
|
%% \end{minipage}
|
|
|
%% \\[2ex]\hline
|
|
|
+\\\hline
|
|
|
\end{tabular}
|
|
|
\fi}
|
|
|
\end{tcolorbox}
|
Peter Thiemann