From c0b987142f621c7625f7b059ab1b4c7c77a625b3 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (office)" <j.wuttke@fz-juelich.de> Date: Mon, 31 Jan 2011 11:43:04 +0100 Subject: [PATCH] enable dy for use with oy and ody --- pub/src/expr.cpp | 2 ++ pub/src/xax_lex.lpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pub/src/expr.cpp b/pub/src/expr.cpp index af3d7e2b..7a367a63 100644 --- a/pub/src/expr.cpp +++ b/pub/src/expr.cpp @@ -116,6 +116,8 @@ void CRef::set_coord( CCoord& ret, uint k_in ) const ret = fd->xco; else if ( typ == _Y ) ret = fd->yco; + else if ( typ == _DY ) + ret = CCoord( "d"+fd->yco.name, fd->yco.unit ); else if ( typ == _NI ) ret = CCoord("#points", ""); else diff --git a/pub/src/xax_lex.lpp b/pub/src/xax_lex.lpp index 9b2aff10..0d72a770 100644 --- a/pub/src/xax_lex.lpp +++ b/pub/src/xax_lex.lpp @@ -47,7 +47,7 @@ EXP [eE]"-"?[0-9]+ xaxlval->v = atof(xaxtext); return NUM; } -[xykji]|n[ij]|([zpr]|cq){DIG}+ { +[xykji]|dy|n[ij]|([zpr]|cq){DIG}+ { // printf( "lex: The variable %s\n", xaxtext ); xaxlval->p = (void*) new CRef(string(xaxtext)); return REF; } -- GitLab