Permalink
Browse files

work on bugs

  • Loading branch information...
1 parent 58400fd commit cc0766eebe816b35a0c90f1ae6e61e5b08107092 @VladD2 VladD2 committed Apr 9, 2012
Showing with 17 additions and 3 deletions.
  1. +1 −1 ncc/parsing/AST.n
  2. +4 −1 ncc/parsing/ParseTree.n
  3. +4 −0 ncc/parsing/Utility.n
  4. +8 −1 ncc/typing/Typer.n
View
@@ -271,7 +271,7 @@ namespace Nemerle.Compiler {
static FakeSourceMask = 0x2000_0000 | 0x4000_0000; // include GeneratedMask!
static GeneratedMask = 0x4000_0000;
- public FileIndex : int { get { _fileIndex & FileIndexMask } }
+ public FileIndex : int { [DebuggerNonUserCode] get { _fileIndex & FileIndexMask } }
mutable _fileIndex : int;
[Accessor] _line : int;
View
@@ -28,6 +28,9 @@
using Nemerle.Compiler;
using Nemerle.Utility;
+
+using System.Diagnostics;
+
using T = Nemerle.Compiler.Typedtree;
namespace Nemerle.Compiler.Parsetree
@@ -792,7 +795,7 @@ namespace Nemerle.Compiler.Parsetree
*/
public Id : string
{
- get { idl }
+ [DebuggerNonUserCode] get { idl }
}
public override ToString () : string
View
@@ -34,6 +34,8 @@ using Nemerle.Compiler;
using Nemerle.Compiler.Util;
using Nemerle.Compiler.Typedtree;
+using System.Diagnostics;
+
using SCG = System.Collections.Generic;
namespace Nemerle.Compiler {
@@ -362,11 +364,13 @@ namespace Nemerle.Compiler {
}
}
+ [DebuggerNonUserCode]
public Push(loc : Location) : void
{
Stack.Add(loc);
}
+ [DebuggerNonUserCode]
public RemoveTop() : void
{
Stack.RemoveAt(Stack.Count - 1)
View
@@ -2895,10 +2895,17 @@ namespace Nemerle.Compiler
seen_empty_ctor = true;
def memTy = meth.GetMemType ();
def from = memTy.from;
+
+ //def mt = FixedType.Fun (from, memTy.argsCount, t.GetMemType ());
+ //def ty = t.FreshSubst ().Apply (mt);
+
def memType = t.GetMemType();
def mt = FixedType.Fun (from, memTy.argsCount, memType);
def ty = if (t.DeclaringType?.Equals(current_type))
- mt
+ {
+ //assert2(false);
+ t.NestingSubst(current_type).Apply(mt)
+ }
else
t.FreshSubst().Apply(mt);
def ret_type = (ty.FixedValue :> FixedType.Fun).to :> FixedType.Class;

0 comments on commit cc0766e

Please sign in to comment.