Skip to content
Snippets Groups Projects
Commit 7e130ce0 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

allow Function Field(1)="expression"; (without extra empty list at the end)
parent a1e20949
Branches
Tags
No related merge requests found
Source diff could not be displayed: it is too large. Options to address this: view the blob.
%{ %{
// $Id: Gmsh.y,v 1.283 2007-09-05 10:11:31 geuzaine Exp $ // $Id: Gmsh.y,v 1.284 2007-09-06 15:49:44 geuzaine Exp $
// //
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
// //
...@@ -1137,6 +1137,14 @@ Shape : ...@@ -1137,6 +1137,14 @@ Shape :
$$.Type = 0; $$.Type = 0;
$$.Num = 0; $$.Num = 0;
} }
| tFunction tField '(' FExpr ')' tAFFECT tBIGSTR tEND
{
std::list<Field*> *flist = new std::list<Field*>;
fields.insert(new FunctionField(flist,$7), (int)$4);
// dummy values
$$.Type = 0;
$$.Num = 0;
}
| tFunction tField '(' FExpr ')' tAFFECT tBIGSTR ListOfDouble tEND | tFunction tField '(' FExpr ')' tAFFECT tBIGSTR ListOfDouble tEND
{ {
std::list<Field*> *flist = new std::list<Field*>; std::list<Field*> *flist = new std::list<Field*>;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */ /* A lexical scanner generated by flex */
/* Scanner skeleton version: /* Scanner skeleton version:
* $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.328 2007-09-05 10:11:31 geuzaine Exp $ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.329 2007-09-06 15:49:45 geuzaine Exp $
*/ */
#define FLEX_SCANNER #define FLEX_SCANNER
...@@ -760,7 +760,7 @@ char *yytext; ...@@ -760,7 +760,7 @@ char *yytext;
#line 1 "Gmsh.l" #line 1 "Gmsh.l"
#define INITIAL 0 #define INITIAL 0
#line 2 "Gmsh.l" #line 2 "Gmsh.l"
// $Id: Gmsh.yy.cpp,v 1.328 2007-09-05 10:11:31 geuzaine Exp $ // $Id: Gmsh.yy.cpp,v 1.329 2007-09-06 15:49:45 geuzaine Exp $
// //
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
// //
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment