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

fix shift/reduce conflict

parent 14de6137
No related branches found
No related tags found
No related merge requests found
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -184,7 +184,7 @@ typedef union YYSTYPE
{
/* Line 1685 of yacc.c */
#line 87 "Gmsh.y"
#line 86 "Gmsh.y"
char *c;
int i;
......
......@@ -20,7 +20,6 @@
#include "Geo.h"
#include "GeoInterpolation.h"
#include "Options.h"
#include "Colors.h"
#include "Parser.h"
#include "OpenFile.h"
#include "CommandLine.h"
......@@ -3424,12 +3423,12 @@ Transfinite :
List_Delete($2);
}
}
| tMeshAlgorithm tSurface ListOfDouble FExpr tEND
| tMeshAlgorithm tSurface '{' RecursiveListOfDouble '}' FExpr tEND
{
for(int i = 0; i < List_Nbr($3); i++){
for(int i = 0; i < List_Nbr($4); i++){
double d;
List_Read($3, i, &d);
CTX::instance()->mesh.algo2d_per_face[(int)d] = (int)$4;
List_Read($4, i, &d);
CTX::instance()->mesh.algo2d_per_face[(int)d] = (int)$6;
}
}
......@@ -4233,14 +4232,14 @@ ColorExpr :
| '{' tSTRING ',' FExpr '}'
{
int flag;
$$ = GetColorForString(ColorString, (int)$4, $2, &flag);
$$ = GetColorForString((int)$4, $2, &flag);
if(flag) yymsg(0, "Unknown color '%s'", $2);
}
*/
| tSTRING
{
int flag;
$$ = GetColorForString(ColorString, -1, $1, &flag);
$$ = GetColorForString(-1, $1, &flag);
if(flag) yymsg(0, "Unknown color '%s'", $1);
Free($1);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment