Skip to content

Commit cded54e

Browse files
committed
Merge pull request #154 from thomasfanell/master
Left parenthesis now allowed to the right of a keyword
2 parents 074091f + 5dae41b commit cded54e

6 files changed

Lines changed: 11 additions & 2 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
bin/
12
build/
23
test/build/

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"name": "Attach",
3232
"type": "node",
3333
// TCP/IP address. Default is "localhost".
34-
"address": "localhost",
34+
//"address": "localhost",
3535
// Port to attach to.
3636
"port": 5858,
3737
"sourceMaps": true

CHANGES.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
**Table of Contents**
2+
- [0.1.21-alpha](#0121-alpha)
23
- [0.1.20-alpha](#0120-alpha)
34
- [0.1.19-alpha](#0119-alpha)
45
- [0.1.18-alpha](#0118-alpha)
@@ -19,6 +20,9 @@
1920
- [0.1.3-alpha](#013-alpha)
2021
- [0.1.2-alpha](#012-alpha)
2122

23+
# 0.1.21-alpha
24+
* Keywords may now have a left parenthesis immediately to its right
25+
2226
# 0.1.20-alpha
2327
* Allow & after keyword
2428

source/Analyzer/Rules/KeywordSpacing.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ module Magic.Analyzer.Rules {
5353
case Frontend.TokenKind.OperatorGreaterThan: // Allow This<T> etc.
5454
case Frontend.TokenKind.OperatorConditional: // Allow in? etc.
5555
case Frontend.TokenKind.SeparatorColon: // Allow func(class: foo) etc.
56+
case Frontend.TokenKind.SeparatorLeftParanthesis:
5657
break;
5758
case Frontend.TokenKind.OperatorMultiply: // Allow 'Keyword*'
5859
break;

source/magic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var fs = require("fs");
2323

2424
module Magic {
2525
export class MagicEntry {
26-
private static version = "0.1.20-alpha";
26+
private static version = "0.1.21-alpha";
2727
private arguments: string[];
2828
private sortByLineNumber = false
2929
constructor(command: string[]) {

test/ooc/NoViolations.ooc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Foobar: class {
22
stackOverflow: func {
33
This new() stackOverflow()
4+
// Keywords used as functions
5+
in?()
6+
in()
47
}
58
}

0 commit comments

Comments
 (0)