expr: remove now unused 'disc' parameter from 'Exdisc_t.reff'

diff --git a/lib/expr/exgram.h b/lib/expr/exgram.h
index d3ddbc91465260237358a7f3146a1c646590f0b8..85e58ab094af5aa5da03b09d791852c02959f214 100644 (file)
--- a/lib/expr/exgram.h
+++ b/lib/expr/exgram.h
@@ -399,7 +399,7 @@ static Exnode_t *makeVar(Expr_t * prog, Exid_t * s, Exnode_t * idx,
        else if (expr.program->disc->reff)
            (*expr.program->disc->reff) (prog, nn,
                                         nn->data.variable.symbol, refs,
-                                        NULL, EX_SCALAR, prog->disc);
+                                        NULL, EX_SCALAR);
 
        return nn;
 }

diff --git a/lib/expr/exparse.y b/lib/expr/exparse.y
index b448eeb8f24b3d61093fe12d2d05cc9a6b7e89c2..09a9126ab35ef825208cf4a9439d15ef14df26f4 100644 (file)
--- a/lib/expr/exparse.y
+++ b/lib/expr/exparse.y
@@ -1009,7 +1009,7 @@ constant  :       CONSTANT
                        if (!expr.program->disc->reff)
                                exerror("%s: identifier references not supported", $1->name);
                        else
-                               $$->data.constant.value = (*expr.program->disc->reff)(expr.program, $$, $1, NULL, NULL, EX_SCALAR, expr.program->disc);
+                               $$->data.constant.value = (*expr.program->disc->reff)(expr.program, $$, $1, NULL, NULL, EX_SCALAR);
                }
                |       FLOATING
                {

diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index bf0ceed4efbaa7307f9f2b9461021b16a5200921..933299c204984e9b2cd068756ea0a04b169d80f2 100644 (file)
--- a/lib/expr/expr.h
+++ b/lib/expr/expr.h
@@ -215,7 +215,7 @@ struct Exdisc_s                             /* discipline                   */
        Exerror_f       errorf;         /* error function               */
        Extype_t        (*getf)(Expr_t*, Exnode_t*, Exid_t*, Exref_t*, void*, int, Exdisc_t*);
                                        /* get value function           */
-       Extype_t        (*reff)(Expr_t*, Exnode_t*, Exid_t*, Exref_t*, char*, int, Exdisc_t*);
+       Extype_t        (*reff)(Expr_t*, Exnode_t*, Exid_t*, Exref_t*, char*, int);
                                        /* reference value function     */
        int             (*setf)(Expr_t*, Exnode_t*, Exid_t*, Exref_t*, void*, int, Extype_t, Exdisc_t*);
                                        /* set value function           */

diff --git a/lib/expr/extoken.c b/lib/expr/extoken.c
index ed0ba6d6d2f202380ecc2945342b902c10075760..8864b1e2491fad237cded93785bc2d17ea05004c 100644 (file)
--- a/lib/expr/extoken.c
+++ b/lib/expr/extoken.c
@@ -859,7 +859,7 @@ extoken_fn(Expr_t* ex)
                        }
                        break;
                }
-               (*ex->disc->reff)(ex, NULL, ex_lval.id, NULL, exstash(ex->tmp, NULL), 0, ex->disc);
+               (*ex->disc->reff)(ex, NULL, ex_lval.id, NULL, exstash(ex->tmp, NULL), 0);
 
                                                /*..INDENT*/
                                        }

diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
index b331b527b370a17d1f5aadb93136f779818cb9d8..b9f5216df4255a670119c74fbf03c6a4339a92a9 100644 (file)
--- a/lib/gvpr/compile.c
+++ b/lib/gvpr/compile.c
@@ -1809,7 +1809,7 @@ static tctype typeChkExp(Exref_t * ref, Exid_t * sym)
  */
 static Extype_t
 refval(Expr_t * pgm, Exnode_t * node, Exid_t * sym, Exref_t * ref,
-       char *str, int elt, Exdisc_t * disc)
+       char *str, int elt)
 {
     (void)str;
     (void)elt;