From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Tue, 8 Sep 2009 19:49:30 +0000 (+0000)
Subject: Use the new function MarkedExprWithCheck.
X-Git-Tag: V2.13.0rc1~120
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=84e288f21cdfc9faf01e50eb8d2ddb83ebf72d2b;p=cc65

Use the new function MarkedExprWithCheck.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4136 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/src/cc65/assignment.c b/src/cc65/assignment.c
index 0cdf2772d..662128c84 100644
--- a/src/cc65/assignment.c
+++ b/src/cc65/assignment.c
@@ -163,8 +163,6 @@ void Assignment (ExprDesc* Expr)
 
         CodeMark AndPos;
         CodeMark PushPos;
-        CodeMark RhsPos;
-        CodeMark RhsEndPos;
 
         unsigned Mask;
         unsigned Flags;
@@ -196,9 +194,7 @@ void Assignment (ExprDesc* Expr)
         g_push (Flags, 0);
 
      	/* Read the expression on the right side of the '=' */
-        GetCodePos (&RhsPos);
-     	hie1 (&Expr2);
-        GetCodePos (&RhsEndPos);
+       	MarkedExprWithCheck (hie1, &Expr2);
 
      	/* Do type conversion if necessary. Beware: Do not use char type
          * here!
@@ -209,7 +205,7 @@ void Assignment (ExprDesc* Expr)
         /* Beware: Expr2 may contain side effects, so there must not be
          * code generated for Expr2.
          */
-        if (ED_IsConstAbsInt (&Expr2) && CodeRangeIsEmpty (&RhsPos, &RhsEndPos)) {
+        if (ED_IsConstAbsInt (&Expr2) && ED_CodeRangeIsEmpty (&Expr2)) {
 
             /* Get the value and apply the mask */
             unsigned Val = (unsigned) (Expr2.IVal & Mask);