forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More progress on the grammar

This commit is contained in:
Hackerpilot 2013-04-04 17:16:38 -07:00
parent 2c56b01c15
commit 366a07ae46
2 changed files with 111 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
d.y
View File

@ -246,6 +246,12 @@ ImportBind: identifier
| identifier "=" identifier | identifier "=" identifier
; ;
DeclarationsAndStatements: Declaration
| Statement
| Declaration DeclarationsAndStatements
| Statement DeclarationsAndStatements
;
Declarations: Declaration Declarations: Declaration
| Declaration Declarations | Declaration Declarations
; ;
@ -253,9 +259,21 @@ Declarations: Declaration
Declaration: ImportDeclaration Declaration: ImportDeclaration
| FunctionDeclaration | FunctionDeclaration
| VariableDeclaration | VariableDeclaration
| AliasThisDeclaration
| ClassDeclaration
| ";" | ";"
; ;
AliasThisDeclaration: "alias" identifier "this"
;
ClassDeclaration: "class" Name ClassBody
| "class" Name ":" IdentifierList ClassBody
;
ClassBody: "{" Declarations "}"
;
Statements: Statement Statements: Statement
| Statement Statements | Statement Statements
; ;
@ -267,13 +285,13 @@ Statement: IfStatement
| ScopeStatement | ScopeStatement
; ;
IfStatement: "if" "(" IfCondition ")" ScopeStatement IfStatement: "if" "(" Expression ")" ScopeStatement
| "if" "(" IfCondition ")" ScopeStatement "else" ScopeStatement | "if" "(" Expression ")" ScopeStatement "else" ScopeStatement
; ;
IfCondition: Expression Expression: UnaryExpression
| "auto" identifier "=" Expression | BinaryExpression
| BasicType Declarator "=" Expression | TernaryExpression
; ;
WhileStatement: "while" "(" Expression ")" ScopeStatement WhileStatement: "while" "(" Expression ")" ScopeStatement
@ -311,6 +329,7 @@ ParameterList: "(" ")"
; ;
Parameters: Type identifier Parameters: Type identifier
| Type identifier "..."
| Type identifier "," Parameters | Type identifier "," Parameters
; ;
@ -357,6 +376,7 @@ AliasInitializer: identifier "=" Type
; ;
VariableDeclaration: Type Names ";" VariableDeclaration: Type Names ";"
| Type identifier "=" Expression ";"
; ;
Names: identifier Names: identifier
@ -364,10 +384,10 @@ Names: identifier
; ;
BasicType: BasicTypeX BasicType: BasicTypeX
| "." IdentifierList /*| "." IdentifierList*/
| IdentifierList /*| IdentifierList*/
| Typeof /*| Typeof*/
| Typeof "." IdentifierList /*| Typeof "." IdentifierList*/
| "const" "(" Type ")" | "const" "(" Type ")"
| "immutable" "(" Type ")" | "immutable" "(" Type ")"
| "shared" "(" Type ")" | "shared" "(" Type ")"
@ -376,13 +396,13 @@ BasicType: BasicTypeX
BasicType2: "*" BasicType2: "*"
| "[" "]" | "[" "]"
| "[" AssignExpression "]" /*| "[" AssignExpression "]"*/
| "[" AssignExpression ".." AssignExpression "]" /*| "[" AssignExpression ".." AssignExpression "]"*/
| "[" Type "]" | "[" Type "]"
| "delegate" Parameters | "delegate" Parameters
| "delegate" Parameters MemberFunctionAttributes /*| "delegate" Parameters MemberFunctionAttributes*/
| "function" Parameters | "function" Parameters
| "function" Parameters FunctionAttributes /*| "function" Parameters FunctionAttributes*/
; ;
/*MixinDeclaration: "mixin" "(" AssignExpression ")" ";" /*MixinDeclaration: "mixin" "(" AssignExpression ")" ";"
@ -398,6 +418,75 @@ CastQual: "const"
| "shared" | "shared"
; ;
UnaryExpression: "++" Expression
| "--" Expression
| "&" Expression
| "!" Expression
| "*" Expression
| "+" Expression
| "-" Expression
| "(" Expression ")"
;
BinaryExpression: Expression BinaryOperator Expression
;
TernaryExpression: Expression "?" Expression ":" Expression
;
BinaryOperator: CalcOperator
| ComparisonOperator
| AssignOperator
;
CalcOperator: "+"
| "-"
| "/"
| "*"
| "^"
| "&"
| "&&"
| "|"
| "||"
| ">>"
| ">>>"
| "<<"
;
AssignOperator: "="
| ">>>="
| ">>="
| "<<="
| "+="
| "-="
| "*="
| "/="
| "^="
| "^^="
| "&="
| "|="
| "~="
;
ComparisonOperator: "<"
| ">"
| ">="
| "<="
| "=="
| "!="
| "!<>="
| "is"
| "!is"
;
IdentifierList: identifier
| identifier "," IdentifierList
;
IdentifierChain: identifier
| identifier "." IdentifierList
;
/* /*
Declaration: AliasDeclaration Declaration: AliasDeclaration
@ -405,8 +494,7 @@ Declaration: AliasDeclaration
| Decl | Decl
; ;
AliasThisDeclaration: "alias" identifier "this"
;
Decl: StorageClasses Decl Decl: StorageClasses Decl
| BasicType Declarators ";" | BasicType Declarators ";"

13
dlex.txt
View File

@ -3,10 +3,10 @@
#include "d.tab.h" #include "d.tab.h"
%} %}
ident [_[:alpha:]][_[:alnum:]]*
ident [_[:alpha:]]* whitespace [:blank:]
whitespace [\n\t\r ] linecomment "//".*
blockcomment "/*"[^"*/"]*"*/"
assign "=" assign "="
at "@" at "@"
bitAnd "&" bitAnd "&"
@ -183,6 +183,9 @@ file __FILE__
line __LINE__ line __LINE__
%% %%
{whitespace} ;
{linecomment} ;
{blockcomment} ;
{import} return import_; {import} return import_;
{static} return static_; {static} return static_;
{bool} return bool_; {bool} return bool_;
@ -207,8 +210,8 @@ line __LINE__
{cdouble} return cdouble_; {cdouble} return cdouble_;
{creal} return creal_; {creal} return creal_;
{void} return void_; {void} return void_;
{class} return class_;
{ident} return identifier; {ident} return identifier;
{whitespace} ;
{assign} return assign; {assign} return assign;
{at} return at; {at} return at;
{bitAnd} return bitAnd; {bitAnd} return bitAnd;