From b1f83bfbf55e59b95ed8d805b21b31e9d3eff9db Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 19 Nov 2015 18:20:09 +0000 Subject: [PATCH] Small fix: slightly more efficient recursion in ExpandLabels and ExpandPropRefsAndLabels. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10899 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/parser/visitor/ExpandLabels.java | 2 +- prism/src/parser/visitor/ExpandPropRefsAndLabels.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prism/src/parser/visitor/ExpandLabels.java b/prism/src/parser/visitor/ExpandLabels.java index d6bc6d86..11890e9d 100644 --- a/prism/src/parser/visitor/ExpandLabels.java +++ b/prism/src/parser/visitor/ExpandLabels.java @@ -58,7 +58,7 @@ public class ExpandLabels extends ASTTraverseModify // But also recursively expand that // (nested labels not currently supported but may be one day) // (don't clone it to avoid duplication of work) - expr = (Expression)expr.expandLabels(labelList); + expr = (Expression) expr.accept(this); // Put in brackets so precedence is preserved // (for display purposes only; in case of re-parse) // Also, preserve type (this is probably being done before diff --git a/prism/src/parser/visitor/ExpandPropRefsAndLabels.java b/prism/src/parser/visitor/ExpandPropRefsAndLabels.java index 27641674..4727a774 100644 --- a/prism/src/parser/visitor/ExpandPropRefsAndLabels.java +++ b/prism/src/parser/visitor/ExpandPropRefsAndLabels.java @@ -62,7 +62,7 @@ public class ExpandPropRefsAndLabels extends ASTTraverseModify // But also recursively expand that // (nested labels not currently supported but may be one day) // (don't clone it to avoid duplication of work) - expr = (Expression)expr.expandLabels(labelList); + expr = (Expression) expr.accept(this); // Put in brackets so precedence is preserved // (for display purposes only; in case of re-parse) // Also, preserve type (this is probably being done before @@ -91,7 +91,7 @@ public class ExpandPropRefsAndLabels extends ASTTraverseModify expr = prop.getExpression().deepCopy(); // But also recursively expand that // (don't clone it to avoid duplication of work) - expr = (Expression)expr.expandPropRefsAndLabels(propertiesFile, labelList); + expr = (Expression) expr.accept(this); // Put in brackets so precedence is preserved // (for display purposes only; in case of re-parse) // Also, preserve type (this is probably being done before