From e1ee2f20d251a5c48d1b94de8a67f2440af66ec5 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Sat, 11 Jul 2020 17:56:50 +0200
Subject: Previous commit made too hastly.

---
 src/core/src/tonkadur/fate/v1/lang/RefType.java    | 6 +++---
 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)
          );
 
-- 
cgit v1.2.3-70-g09d2