not allow override of generic base type in global scope

sekiguchi-nagisa · Aug 9, 2023 · 3b1b5cb · 3b1b5cb
1 parent 41e8b3b
commit 3b1b5cb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@
     - ``MODULE_HOME`` indicates ``XDG_DATA_HOME/modules``
     - ``MODULE_DIR`` indicates ``DATA_DIR/modules``
     - completion script directory indicates ``DATA_DIR/completions``
+- **Breaking Change**: not allow override of generic base type in global scope
 - improve error message of type lookup errors
     - report correct position of invalid type elements
     - report more detailed error message for invalid type elements

diff --git a/src/scope.cpp b/src/scope.cpp
@@ -108,8 +108,7 @@ NameRegisterResult NameScope::defineAlias(std::string &&name, const HandlePtr &h
 NameRegisterResult NameScope::defineTypeAlias(const TypePool &pool, const std::string &name,
                                               const DSType &type) {
   if (this->isGlobal()) {
-    auto ret = pool.getType(name);
-    if (ret) {
+    if (pool.getType(name) || pool.getTypeTemplate(name)) {
       return Err(NameRegisterError::DEFINED);
     }
   }

diff --git a/test/exec/cases/always_failed/typedef_alias1.ds b/test/exec/cases/always_failed/typedef_alias1.ds
@@ -1,9 +1,9 @@
-##$test($result = 'type', $status = 1, $chars = 9, $errorKind = 'DefinedTypeAlias', $lineNum = 8)
+#$test($result = 'type', $status = 1, $chars = 9, $errorKind = 'DefinedTypeAlias', $lineNum = 8)
 
 typedef catch = Int
 
 assert(12 is catch) # allow any identifier
 
 
-typedef Func = Int  # allow generic template
+typedef Func = Int  # do not allow generic template
 assert(12 is Func)