stepan
/
preprocessor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macro processor: add for syntax for shortcut with filtering comprehension 

closes #28
issue#70
Houtan Bastani 2019-08-26 15:38:08 +02:00
parent def99f9dd3
commit 2b3519e3b0
No known key found for this signature in database
GPG Key ID: 000094FB955BE169
2 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/macroprocessor/macroprocessor.tex
View File

@ -399,12 +399,26 @@ end;
\end{frame}
\begin{frame}[fragile=singleslide]
\frametitle{Loop directive}
\begin{block}{Syntax}
\frametitle{Loop directive (1/2)}
\begin{block}{Syntax 1}
\verb+@#for +\textit{variable\_name}\verb+ in +\textit{array\_expr} \\
\verb+ +\textit{loop\_body} \\
\verb+@#endfor+
\end{block}
\begin{block}{Syntax 2}
\verb+@#for +\textit{tuple}\verb+ in +\textit{array\_expr} \\
\verb+ +\textit{loop\_body} \\
\verb+@#endfor+
\end{block}
\begin{block}{Syntax 3}
\verb+@#for +\textit{tuple\_or\_variable}\verb+ in +\textit{array\_expr} \verb+ when +\textit{expr}\\
\verb+ +\textit{loop\_body} \\
\verb+@#endfor+
\end{block}
\end{frame}
\begin{frame}[fragile=singleslide]
\frametitle{Loop directive (2/2)}
\begin{block}{Example: before macro processing}
\small
\begin{verbatim}

56
src/macro/Parser.yy
View File

@ -95,11 +95,10 @@ using namespace macro;
%type <DirectivePtr> directive directive_one_line directive_multiline for if ifdef ifndef text eval
%type <vector<pair<ExpressionPtr, vector<DirectivePtr>>>> if_list if_list1
%type <pair<ExpressionPtr, vector<DirectivePtr>>> elseif else
%type <ExpressionPtr> primary_expr oper_expr colon_expr expr
%type <ExpressionPtr> primary_expr oper_expr colon_expr expr for_when
%type <FunctionPtr> function
%type <VariablePtr> symbol
%type <vector<VariablePtr>> comma_name
%type <vector<ExpressionPtr>> comma_expr function_args tuple_comma_expr
%%
@ -149,38 +148,43 @@ directive_multiline : for
| ifndef
;
for_begin : FOR { driver.pushContext(); } ;
for_when : %empty
{ $$ = shared_ptr<Expression>(); }
| WHEN expr
{ $$ = $2; }
;
for : for_begin symbol IN expr EOL statements ENDFOR
{
vector<VariablePtr> vvnp = {$2};
auto vdp = driver.popContext();
vdp.emplace_back(make_shared<TextNode>("\n", driver.env, @7));
$$ = make_shared<For>(vvnp, $4, vdp, driver.env, @$);
}
| for_begin LPAREN comma_name RPAREN IN expr EOL statements ENDFOR
for : FOR { driver.pushContext(); } expr IN expr for_when EOL statements ENDFOR
{
vector<VariablePtr> vvnp;
for (auto & it : $3)
{
auto vnp = dynamic_pointer_cast<Variable>(it);
if (!vnp)
error(@$, "For loop indices must be variables");
vvnp.push_back(vnp);
}
auto tmpt = dynamic_pointer_cast<Tuple>($3);
auto tmpv = dynamic_pointer_cast<Variable>($3);
if (tmpv)
vvnp.emplace_back(tmpv);
else if (tmpt)
for (auto & it : tmpt->getValue())
{
auto vnp = dynamic_pointer_cast<Variable>(it);
if (!vnp)
error(@$, "For loop indices must be variables");
vvnp.emplace_back(vnp);
}
else
error(@1, "For loop indices must be a variable or a tuple");
auto vdp = driver.popContext();
vdp.emplace_back(make_shared<TextNode>("\n", driver.env, @9));
$$ = make_shared<For>(vvnp, $6, vdp, driver.env, @$);
if (!$6)
$$ = make_shared<For>(vvnp, $5, vdp, driver.env, @$);
else
{
auto tmpc = make_shared<Comprehension>(true, $3, $5, $6, driver.env, @6);
$$ = make_shared<For>(vvnp, tmpc, vdp, driver.env, @$);
}
}
;
comma_name : NAME
{ $$ = vector<VariablePtr>{make_shared<Variable>($1, driver.env, @$)}; }
| comma_name COMMA NAME
{ $1.emplace_back(make_shared<Variable>($3, driver.env, @3)); $$ = $1; }
;
if : IF { driver.pushContext(); } if_list ENDIF
{ $$ = make_shared<If>($3, driver.env, @$); }
;