Skip to content

Commit

Permalink
Update boot. Support "precedence" syntax.
Browse files Browse the repository at this point in the history
  • Loading branch information
VladD2 committed Aug 8, 2012
1 parent 41ad3d6 commit f6fe1f3
Show file tree
Hide file tree
Showing 17 changed files with 264 additions and 265 deletions.
4 changes: 2 additions & 2 deletions Boot.Nemerle.Parser/Descriptors/GrammarDescriptor.n
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ namespace Nemerle.Parser
///Internal. Do not use.
public abstract NewParsingErrors() : Internal.ParsingErrors;

[Accessor]
private static _default : GrammarDescriptor = DefaultGrammarDescriptor();
public static Default : GrammarDescriptor { get; default DefaultGrammarDescriptor(); }

private class DefaultGrammarDescriptor : GrammarDescriptor
{
public override Name : string { get { "DefaultGrammar" } }
Expand Down
2 changes: 1 addition & 1 deletion Boot.Nemerle.Parser/Descriptors/RuleDescriptor.n
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ namespace Nemerle.Parser
public abstract Name : string { get; }
public abstract Grammar : GrammarDescriptor { get; }
public virtual IsStart : bool { get { false } }
public virtual Parse(source : SourceSnapshot) : option[Ast] { _ = source; throw NotSupportedException() }
public virtual Parse(source : SourceSnapshot) : Ast { _ = source; throw NotSupportedException() }
}
}
2 changes: 1 addition & 1 deletion Boot.Nemerle.Parser/Location.n
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace Nemerle.Parser
this(source, Math.Min(a.StartPos, b.StartPos), Math.Max(a.EndPos, b.EndPos))
}

[Accessor] private static default : Location = Location(SourceSnapshot.Default, -1, -1);
public static Default : Location { get; default Location(SourceSnapshot.Default, -1, -1) }

public IsEmpty : bool { get { StartPos == EndPos } }

Expand Down
2 changes: 1 addition & 1 deletion Boot.Nemerle.Parser/SourceSnapshot.n
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace Nemerle.Parser
this(text, text, fileIndex, fileName, MakeLineIndexes(text));
}

[Accessor] private static default : SourceSnapshot = SourceSnapshot("", -1, "");
public static Default : SourceSnapshot { get; default SourceSnapshot("", -1, "") }

public PositionToLineColumn(pos : int) : int * int
{
Expand Down
5 changes: 2 additions & 3 deletions Boot.Nemerle.Parser/SpanClass.n
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ namespace Nemerle.Parser
public Name : string { get; }
public Grammar : GrammarDescriptor { get; }

[Accessor]
private static _default : SpanClass = SpanClass("Default", GrammarDescriptor.Default);

public static Default : SpanClass { get; default SpanClass("Default", GrammarDescriptor.Default) }

public override ToString() : string { Name }
}
}
Binary file modified Boot/Net-4.0/Nemerle.Compiler.dll
Binary file not shown.
Binary file modified Boot/Net-4.0/Nemerle.MSBuild.Tasks.dll
Binary file not shown.
514 changes: 257 additions & 257 deletions Boot/Net-4.0/Nemerle.MSBuild.targets

Large diffs are not rendered by default.

Binary file modified Boot/Net-4.0/Nemerle.Macros.dll
Binary file not shown.
Binary file modified Boot/Net-4.0/Nemerle.Parser.Macro.Model.dll
Binary file not shown.
Binary file modified Boot/Net-4.0/Nemerle.Parser.Macro.Parser.dll
Binary file not shown.
Binary file modified Boot/Net-4.0/Nemerle.Parser.Macro.dll
Binary file not shown.
Binary file modified Boot/Net-4.0/Nemerle.Parser.dll
Binary file not shown.
Binary file modified Boot/Net-4.0/Nemerle.dll
Binary file not shown.
Binary file modified Boot/Net-4.0/ncc.exe
Binary file not shown.
Binary file modified Boot/Net-4.0/ncc32.exe
Binary file not shown.
Binary file modified Boot/Net-4.0/ncc64.exe
Binary file not shown.

0 comments on commit f6fe1f3

Please sign in to comment.