Skip to content

Commit f5fe583

Browse files
committed
Fix NemerleAll.nproj and detection of external parser loading.
1 parent ae60dc5 commit f5fe583

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

NemerleAll.nproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
<Exec Command="$(Nuget) pack Nemerle.Compiler.nuspec -OutputDirectory &quot;$(NugetOutput)&quot; -Properties &quot;$(NugetProperties)&quot;" WorkingDirectory="$(NRoot)" />
534534
</Target>
535535

536-
<Target Name="DevBuildQuickNccOnly" DependsOnTargets="Stage1; Install" />
536+
<Target Name="DevBuildQuickNccOnly" DependsOnTargets="Stage1; Linq;Unsafe;_PegAndCSharp; Install" />
537537
<Target Name="DevBuildQuick" DependsOnTargets="Stage1; _NugetPack; _Integration; Install" />
538538
<Target Name="DevBuildQuickWithTests" DependsOnTargets="Stage1; CompilerTests; _NugetPack; _Integration; IdeEngineTests; Install" />
539539
<Target Name="DevBuild2Stage" DependsOnTargets="Stage2; _NugetPack; _Integration; Install" />

ncc/external/LibraryReferenceManager.n

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ namespace Nemerle.Compiler
9797
};
9898

9999
mutable libraryReference;
100-
100+
101101
if (assembly == null)
102102
{
103103
def msg = $"cannot find assembly `$name'";
@@ -124,7 +124,7 @@ namespace Nemerle.Compiler
124124
public AddAssembly (assembly : SR.Assembly, isUserReference : bool) : void
125125
{
126126
mutable libraryReference;
127-
127+
128128
if (_loaded_assemblies_by_name.TryGetValue(assembly.FullName, out libraryReference))
129129
when (isUserReference && !libraryReference.IsUserReference)
130130
libraryReference.IsUserReference = isUserReference;
@@ -441,11 +441,11 @@ namespace Nemerle.Compiler
441441
{
442442
assert(assembly != null);
443443

444-
def assemblyAttributes = assembly.GetCustomAttributes(false);
445-
def parserDefs = assemblyAttributes.Filter(t => t.GetType().FullName == "Nemerle.Internal.RegisterParserAttribute");
446-
447444
try
448445
{
446+
def assemblyAttributes = assembly.GetCustomAttributes(false);
447+
def parserDefs = assemblyAttributes.Filter(t => t.GetType().FullName == "Nemerle.Internal.RegisterParserAttribute");
448+
449449
foreach(definition in parserDefs)
450450
{
451451
def parserTypeName = late(definition.Name) :> string;

0 commit comments

Comments
 (0)