Skip to content

Commit 2f2dc58

Browse files
committed
Fix failure to pass namespace to type resolution method. (Regression)
1 parent ff88089 commit 2f2dc58

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Clojure/Clojure/Lib/ClrTypeSpec2.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -455,15 +455,15 @@ void AddName(string type_name)
455455
else
456456
{
457457
if (_nested is null)
458-
_nested = new List<IClrTypeIdentifier>();
458+
_nested = [];
459459
_nested.Add(ParsedTypeIdentifier(type_name));
460460
}
461461
}
462462

463463
void AddModifier(IClrModifierSpec md)
464464
{
465465
if (_modifierSpec is null)
466-
_modifierSpec = new List<IClrModifierSpec>();
466+
_modifierSpec = [];
467467
_modifierSpec.Add(md);
468468
}
469469

@@ -503,7 +503,7 @@ void MergeNested(ClrTypeSpec nestedSpec)
503503

504504
// Append all nested names to the current type
505505
if (_nested is null)
506-
_nested = new List<IClrTypeIdentifier>();
506+
_nested = [];
507507
_nested.Add(nestedSpec._name);
508508

509509
if (nestedSpec._nested is not null)
@@ -515,14 +515,14 @@ void MergeNested(ClrTypeSpec nestedSpec)
515515
if (nestedSpec._genericParams is not null)
516516
{
517517
if (_genericParams is null)
518-
_genericParams = new List<ClrTypeSpec>();
518+
_genericParams = [];
519519
_genericParams.AddRange(nestedSpec._genericParams);
520520
}
521521
// append any modifiers to the current type
522522
if (nestedSpec._modifierSpec is not null)
523523
{
524524
if (_modifierSpec is null)
525-
_modifierSpec = new List<IClrModifierSpec>();
525+
_modifierSpec = [];
526526
_modifierSpec.AddRange(nestedSpec._modifierSpec);
527527
}
528528

@@ -684,7 +684,7 @@ static ClrTypeSpec Parse(string name, ref int p, bool is_recurse, bool allow_aqn
684684

685685
if (name[pos] != ',' && name[pos] != '*' && name[pos] != ']')
686686
{//generic args
687-
List<ClrTypeSpec> args = new();
687+
List<ClrTypeSpec> args = [];
688688
if (data.HasModifiers)
689689
throw new ArgumentException("generic args after array spec or pointer type", "typeName");
690690

@@ -923,7 +923,7 @@ private string MaybeAddBackquoteArity(IClrTypeIdentifier name)
923923
public static Type GetTypeFromName(string name, Namespace ns = null)
924924
{
925925
ClrTypeSpec spec = Parse(name);
926-
return GetTypeFromParsedName(spec);
926+
return GetTypeFromParsedName(spec, ns);
927927

928928
}
929929

0 commit comments

Comments
 (0)