Merge pull request #1 from bsenduran/public-const

Add public key to const defintion
bsenduran · Jan 30, 2017 · 1e991a1 · 1e991a1
2 parents 60a6cba + e71b013
commit 1e991a1
Show file tree

Hide file tree

Showing 5 changed files with 850 additions and 841 deletions.
diff --git a/docs/grammar/Ballerina.g4 b/docs/grammar/Ballerina.g4
@@ -68,7 +68,7 @@ structDefinition
     ;
 
 structDefinitionBody
-    :   '{' (Identifier ':' typeName ';')+ '}'
+    :   '{' (typeName Identifier ';')+ '}'
     ;
 
 typeConvertorDefinition
@@ -85,7 +85,7 @@ typeConvertorBody
     ;
 
 constantDefinition
-    :   'const' typeName Identifier '=' literalValue ';'
+    :   'public'? 'const' typeName Identifier '=' literalValue ';'
     ;
 
 // cannot have conector declaration, need to validate at semantic analyzing

diff --git a/modules/ballerina-core/src/main/java/org/wso2/ballerina/core/parser/Ballerina.tokens b/modules/ballerina-core/src/main/java/org/wso2/ballerina/core/parser/Ballerina.tokens
@@ -76,9 +76,9 @@ LINE_COMMENT=72
 '('=4
 ')'=5
 'native'=6
-':'=7
-'='=8
-','=9
+'='=7
+','=8
+':'=9
 '[]'=10
 '~'=11
 '<'=12

diff --git a/modules/ballerina-core/src/main/java/org/wso2/ballerina/core/parser/BallerinaLexer.java b/modules/ballerina-core/src/main/java/org/wso2/ballerina/core/parser/BallerinaLexer.java
@@ -56,7 +56,7 @@ public class BallerinaLexer extends Lexer {
 	};
 
 	private static final String[] _LITERAL_NAMES = {
-		null, "';'", "'{'", "'}'", "'('", "')'", "'native'", "':'", "'='", "','", 
+		null, "';'", "'{'", "'}'", "'('", "')'", "'native'", "'='", "','", "':'", 
 		"'[]'", "'~'", "'<'", "'>'", "'.'", "'@'", "'->'", "'<-'", "'['", "']'", 
 		"'+'", "'-'", "'!'", "'^'", "'/'", "'*'", "'%'", "'&&'", "'||'", "'>='", 
 		"'<='", "'=='", "'!='", "'action'", "'all'", "'any'", "'as'", "'break'", 
@@ -237,8 +237,8 @@ public BallerinaLexer(CharStream input) {
 		"\2\2\u00ef\u00f0\7*\2\2\u00f0\n\3\2\2\2\u00f1\u00f2\7+\2\2\u00f2\f\3\2"+
 		"\2\2\u00f3\u00f4\7p\2\2\u00f4\u00f5\7c\2\2\u00f5\u00f6\7v\2\2\u00f6\u00f7"+
 		"\7k\2\2\u00f7\u00f8\7x\2\2\u00f8\u00f9\7g\2\2\u00f9\16\3\2\2\2\u00fa\u00fb"+
-		"\7<\2\2\u00fb\20\3\2\2\2\u00fc\u00fd\7?\2\2\u00fd\22\3\2\2\2\u00fe\u00ff"+
-		"\7.\2\2\u00ff\24\3\2\2\2\u0100\u0101\7]\2\2\u0101\u0102\7_\2\2\u0102\26"+
+		"\7?\2\2\u00fb\20\3\2\2\2\u00fc\u00fd\7.\2\2\u00fd\22\3\2\2\2\u00fe\u00ff"+
+		"\7<\2\2\u00ff\24\3\2\2\2\u0100\u0101\7]\2\2\u0101\u0102\7_\2\2\u0102\26"+
 		"\3\2\2\2\u0103\u0104\7\u0080\2\2\u0104\30\3\2\2\2\u0105\u0106\7>\2\2\u0106"+
 		"\32\3\2\2\2\u0107\u0108\7@\2\2\u0108\34\3\2\2\2\u0109\u010a\7\60\2\2\u010a"+
 		"\36\3\2\2\2\u010b\u010c\7B\2\2\u010c \3\2\2\2\u010d\u010e\7/\2\2\u010e"+

diff --git a/modules/ballerina-core/src/main/java/org/wso2/ballerina/core/parser/BallerinaLexer.tokens b/modules/ballerina-core/src/main/java/org/wso2/ballerina/core/parser/BallerinaLexer.tokens
@@ -76,9 +76,9 @@ LINE_COMMENT=72
 '('=4
 ')'=5
 'native'=6
-':'=7
-'='=8
-','=9
+'='=7
+','=8
+':'=9
 '[]'=10
 '~'=11
 '<'=12
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,9 +76,9 @@ LINE_COMMENT=72 @@
     '('=4
     ')'=5
     'native'=6
-    ':'=7
-    '='=8
-    ','=9
+    '='=7
+    ','=8
+    ':'=9
     '[]'=10
     '~'=11
     '<'=12
@@ Expand Down @@