| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | src/core/src/tonkadur/fate/v1/lang/RefType.java | 6 | ||||
| -rw-r--r-- | src/core/src/tonkadur/fate/v1/parser/FateParser.g4 | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/core/src/tonkadur/fate/v1/lang/RefType.java b/src/core/src/tonkadur/fate/v1/lang/RefType.java index 4d0429e..423f695 100644 --- a/src/core/src/tonkadur/fate/v1/lang/RefType.java +++ b/src/core/src/tonkadur/fate/v1/lang/RefType.java @@ -29,7 +29,7 @@ public class RefType extends Type } /**** Accessors ************************************************************/ - public referenced_type get_referenced_type () + public Type get_referenced_type () { return referenced_type; } @@ -69,7 +69,7 @@ public class RefType extends Type dt = (RefType) de; resulting_referenced_type = - (Type) referenced_type.generate_comparable_to(de.referenced_type); + (Type) referenced_type.generate_comparable_to(dt.referenced_type); return new RefType(get_origin(), resulting_referenced_type, name); } @@ -82,7 +82,7 @@ public class RefType extends Type final StringBuilder sb = new StringBuilder(); sb.append("(Ref to "); - sb.append(resulting_referenced_type.toString()) + sb.append(referenced_type.toString()); sb.append(")::"); sb.append(name); diff --git a/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 b/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 index cc33b07..b665211 100644 --- a/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 +++ b/src/core/src/tonkadur/fate/v1/parser/FateParser.g4 @@ -257,8 +257,8 @@ first_level_fate_instr: start_origin = CONTEXT.get_origin_at ( - ($DECLARE_LIST_TYPE_KW.getLine()), - ($DECLARE_LIST_TYPE_KW.getCharPositionInLine()) + ($DECLARE_REF_TYPE_KW.getLine()), + ($DECLARE_REF_TYPE_KW.getCharPositionInLine()) ); new_type = @@ -266,7 +266,6 @@ first_level_fate_instr: ( start_origin, ($parent.result), - false, ($new_reference_name.result) ); |