From fa2dc24aa0213b8c9ce417dfab75e83a2d39036c Mon Sep 17 00:00:00 2001 From: Marvin Schlegel Date: Thu, 2 May 2024 22:38:58 +0200 Subject: [PATCH] indent with spaces --- src/Parser/JavaParser.y | 242 ++++++++++++++++++++-------------------- 1 file changed, 120 insertions(+), 122 deletions(-) diff --git a/src/Parser/JavaParser.y b/src/Parser/JavaParser.y index 7b0695c..fc4ce89 100644 --- a/src/Parser/JavaParser.y +++ b/src/Parser/JavaParser.y @@ -1,6 +1,6 @@ { module Parser.JavaParser (parse) where ---import AbsSyn +import Ast import Parser.Lexer } @@ -15,9 +15,9 @@ import Parser.Lexer CHAR { CHAR } CLASS { CLASS} IDENTIFIER { IDENTIFIER $$} - INTLITERAL { INTLITERAL $$} + INTLITERAL { INTEGERLITERAL $$} DOT { DOT } - MOD { MOD } + MOD { MODULO } TIMESEQUAL { TIMESEQUAL } GREATEREQUAL { GREATEREQUAL } WHILE { WHILE } @@ -29,30 +29,29 @@ import Parser.Lexer THIS { THIS } STATIC { STATIC } PROTECTED { PROTECTED } - TILDE { TILDE } - MUL { MUL } + TILDE { BITWISENOT } + MUL { TIMES } MINUS { MINUS } - EXCLMARK { EXCLMARK } + EXCLMARK { NOT } IF { IF } ELSE { ELSE } - DIVIDEEQUAL { DIVIDEEQUAL } + DIVIDEEQUAL { DIVEQUAL } NEW { NEW } LBRACKET { LBRACKET } - JNULL { JNULL } - BOOLLITERAL { BOOLLITERAL } + JNULL { NULLLITERAL } + BOOLLITERAL { BOOLLITERAL $$ } DIV { DIV } - LOGICALOR { LOGICALOR } + LOGICALOR { OR } NOTEQUAL { NOTEQUAL } INSTANCEOF { INSTANCEOF } ANDEQUAL { ANDEQUAL } ASSIGN { ASSIGN } DECREMENT { DECREMENT } - STRINGLITERAL { STRINGLITERAL } - CHARLITERAL { CHARLITERAL } + CHARLITERAL { CHARLITERAL $$ } AND { AND } XOREQUAL { XOREQUAL } RETURN { RETURN } - QUESMARK { QUESMARK } + QUESMARK { QUESTIONMARK } SHIFTLEFTEQUAL { SHIFTLEFTEQUAL } RBRACKET { RBRACKET } COMMA { COMMA } @@ -68,7 +67,7 @@ import Parser.Lexer INT { INT } ABSTRACT { ABSTRACT } SEMICOLON { SEMICOLON } - SIGNEDSHIFTRIGHTEQUAL { SIGNEDSHIFTRIGHTEQUAL } + SIGNEDSHIFTRIGHTEQUAL { SHIFTRIGHTEQUAL } UNSIGNEDSHIFTRIGHTEQUAL { UNSIGNEDSHIFTRIGHTEQUAL } PLUSEQUAL { PLUSEQUAL } OREQUAL { OREQUAL } @@ -79,10 +78,10 @@ import Parser.Lexer compilationunit : typedeclarations { } typedeclarations : typedeclaration { } - | typedeclarations typedeclaration { } + | typedeclarations typedeclaration { } name : qualifiedname { } - | simplename { } + | simplename { } typedeclaration : classdeclaration { } @@ -94,16 +93,16 @@ classdeclaration : CLASS IDENTIFIER classbody { } | modifiers CLASS IDENTIFIER classbody { } classbody : LBRACKET RBRACKET { ([], []) } - | LBRACKET classbodydeclarations RBRACKET { } + | LBRACKET classbodydeclarations RBRACKET { } modifiers : modifier { } - | modifiers modifier { } + | modifiers modifier { } classbodydeclarations : classbodydeclaration { } - | classbodydeclarations classbodydeclaration{ } + | classbodydeclarations classbodydeclaration{ } modifier : PUBLIC { } - | PROTECTED { } + | PROTECTED { } | PRIVATE { } | STATIC { } | ABSTRACT { } @@ -111,77 +110,77 @@ modifier : PUBLIC { } classtype : classorinterfacetype{ } classbodydeclaration : classmemberdeclaration { } - | constructordeclaration { } + | constructordeclaration { } classorinterfacetype : name{ } classmemberdeclaration : fielddeclaration { } - | methoddeclaration { } + | methoddeclaration { } constructordeclaration : constructordeclarator constructorbody { } - | modifiers constructordeclarator constructorbody { } + | modifiers constructordeclarator constructorbody { } fielddeclaration : type variabledeclarators SEMICOLON { } - | modifiers type variabledeclarators SEMICOLON { } + | modifiers type variabledeclarators SEMICOLON { } methoddeclaration : methodheader methodbody { } block : LBRACKET RBRACKET { } - | LBRACKET blockstatements RBRACKET { } + | LBRACKET blockstatements RBRACKET { } constructordeclarator : simplename LBRACE RBRACE { } - | simplename LBRACE formalparameterlist RBRACE { } + | simplename LBRACE formalparameterlist RBRACE { } -constructorbody : LBRACKET RBRACKET { } - | LBRACKET explicitconstructorinvocation RBRACKET { } - | LBRACKET blockstatements RBRACKET { } - | LBRACKET explicitconstructorinvocation blockstatements RBRACKET { } +constructorbody : LBRACKET RBRACKET { } + | LBRACKET explicitconstructorinvocation RBRACKET { } + | LBRACKET blockstatements RBRACKET { } + | LBRACKET explicitconstructorinvocation blockstatements RBRACKET { } -methodheader : type methoddeclarator { } - | modifiers type methoddeclarator { } - | VOID methoddeclarator { } - | modifiers VOID methoddeclarator { } +methodheader : type methoddeclarator { } + | modifiers type methoddeclarator { } + | VOID methoddeclarator { } + | modifiers VOID methoddeclarator { } type : primitivetype { } - | referencetype { } + | referencetype { } variabledeclarators : variabledeclarator { } - | variabledeclarators COMMA variabledeclarator { } + | variabledeclarators COMMA variabledeclarator { } methodbody : block { } - | SEMICOLON { } + | SEMICOLON { } blockstatements : blockstatement { } - | blockstatements blockstatement { } + | blockstatements blockstatement { } formalparameterlist : formalparameter { } - | formalparameterlist COMMA formalparameter{ } + | formalparameterlist COMMA formalparameter{ } explicitconstructorinvocation : THIS LBRACE RBRACE SEMICOLON { } - | THIS LBRACE argumentlist RBRACE SEMICOLON { } + | THIS LBRACE argumentlist RBRACE SEMICOLON { } classtypelist : classtype { } - | classtypelist COMMA classtype { } + | classtypelist COMMA classtype { } methoddeclarator : IDENTIFIER LBRACE RBRACE { } - | IDENTIFIER LBRACE formalparameterlist RBRACE { } + | IDENTIFIER LBRACE formalparameterlist RBRACE { } primitivetype : BOOLEAN { } - | numerictype { } + | numerictype { } referencetype : classorinterfacetype { } variabledeclarator : variabledeclaratorid { } - | variabledeclaratorid ASSIGN variableinitializer { } + | variabledeclaratorid ASSIGN variableinitializer { } -blockstatement : localvariabledeclarationstatement { } - | statement { } +blockstatement : localvariabledeclarationstatement { } + | statement { } formalparameter : type variabledeclaratorid { } argumentlist : expression { } - | argumentlist COMMA expression { } + | argumentlist COMMA expression { } numerictype : integraltype { } @@ -192,10 +191,10 @@ variableinitializer : expression { } localvariabledeclarationstatement : localvariabledeclaration SEMICOLON { } statement : statementwithouttrailingsubstatement{ } - | ifthenstatement { } - | ifthenelsestatement { } - | whilestatement { } - + | ifthenstatement { } + | ifthenelsestatement { } + | whilestatement { } + expression : assignmentexpression { } @@ -205,9 +204,9 @@ integraltype : INT { } localvariabledeclaration : type variabledeclarators { } statementwithouttrailingsubstatement : block { } - | emptystatement { } - | expressionstatement { } - | returnstatement { } + | emptystatement { } + | expressionstatement { } + | returnstatement { } ifthenstatement : IF LBRACE expression RBRACE statement { } @@ -216,55 +215,55 @@ ifthenelsestatement : IF LBRACE expression RBRACE statementnoshortif ELSE state whilestatement : WHILE LBRACE expression RBRACE statement { } assignmentexpression : conditionalexpression { } - | assignment{ } + | assignment{ } -emptystatement : SEMICOLON { } +emptystatement : SEMICOLON { } expressionstatement : statementexpression SEMICOLON { } returnstatement : RETURN SEMICOLON { } - | RETURN expression SEMICOLON { } + | RETURN expression SEMICOLON { } statementnoshortif : statementwithouttrailingsubstatement { } - | ifthenelsestatementnoshortif { } - | whilestatementnoshortif { } + | ifthenelsestatementnoshortif { } + | whilestatementnoshortif { } conditionalexpression : conditionalorexpression { } - | conditionalorexpression QUESMARK expression COLON conditionalexpression { } + | conditionalorexpression QUESMARK expression COLON conditionalexpression { } assignment :lefthandside assignmentoperator assignmentexpression { } - + statementexpression : assignment { } - | preincrementexpression { } - | predecrementexpression { } - | postincrementexpression { } - | postdecrementexpression { } - | methodinvocation { } - | classinstancecreationexpression { } + | preincrementexpression { } + | predecrementexpression { } + | postincrementexpression { } + | postdecrementexpression { } + | methodinvocation { } + | classinstancecreationexpression { } ifthenelsestatementnoshortif :IF LBRACE expression RBRACE statementnoshortif - ELSE statementnoshortif { } + ELSE statementnoshortif { } whilestatementnoshortif : WHILE LBRACE expression RBRACE statementnoshortif { } conditionalorexpression : conditionalandexpression { } - | conditionalorexpression LOGICALOR conditionalandexpression{ } + | conditionalorexpression LOGICALOR conditionalandexpression{ } lefthandside : name { } assignmentoperator : ASSIGN{ } - | TIMESEQUAL { } - | DIVIDEEQUAL { } - | MODULOEQUAL { } - | PLUSEQUAL { } - | MINUSEQUAL { } - | SHIFTLEFTEQUAL { } - | SIGNEDSHIFTRIGHTEQUAL { } - | UNSIGNEDSHIFTRIGHTEQUAL { } - | ANDEQUAL { } - | XOREQUAL { } - | OREQUAL{ } + | TIMESEQUAL { } + | DIVIDEEQUAL { } + | MODULOEQUAL { } + | PLUSEQUAL { } + | MINUSEQUAL { } + | SHIFTLEFTEQUAL { } + | SIGNEDSHIFTRIGHTEQUAL { } + | UNSIGNEDSHIFTRIGHTEQUAL { } + | ANDEQUAL { } + | XOREQUAL { } + | OREQUAL{ } preincrementexpression : INCREMENT unaryexpression { } @@ -275,9 +274,9 @@ postincrementexpression : postfixexpression INCREMENT { } postdecrementexpression : postfixexpression DECREMENT { } methodinvocation : name LBRACE RBRACE { } - | name LBRACE argumentlist RBRACE { } - | primary DOT IDENTIFIER LBRACE RBRACE { } - | primary DOT IDENTIFIER LBRACE argumentlist RBRACE { } + | name LBRACE argumentlist RBRACE { } + | primary DOT IDENTIFIER LBRACE RBRACE { } + | primary DOT IDENTIFIER LBRACE argumentlist RBRACE { } classinstancecreationexpression : NEW classtype LBRACE RBRACE { } | NEW classtype LBRACE argumentlist RBRACE { } @@ -286,70 +285,69 @@ conditionalandexpression : inclusiveorexpression { } fieldaccess : primary DOT IDENTIFIER { } -unaryexpression : preincrementexpression { } - | predecrementexpression { } - | PLUS unaryexpression { } - | MINUS unaryexpression { } - | unaryexpressionnotplusminus { } +unaryexpression : preincrementexpression { } + | predecrementexpression { } + | PLUS unaryexpression { } + | MINUS unaryexpression { } + | unaryexpressionnotplusminus { } postfixexpression : primary { } - | name { } - | postincrementexpression { } - | postdecrementexpression{ } + | name { } + | postincrementexpression { } + | postdecrementexpression{ } -primary : primarynonewarray { } +primary : primarynonewarray { } inclusiveorexpression : exclusiveorexpression { } - | inclusiveorexpression OR exclusiveorexpression { } + | inclusiveorexpression OR exclusiveorexpression { } primarynonewarray : literal { } - | THIS { } - | LBRACE expression RBRACE { } + | THIS { } + | LBRACE expression RBRACE { } | classinstancecreationexpression { } - | fieldaccess { } - | methodinvocation { } + | fieldaccess { } + | methodinvocation { } unaryexpressionnotplusminus : postfixexpression { } - | TILDE unaryexpression { } - | EXCLMARK unaryexpression { } - | castexpression{ } + | TILDE unaryexpression { } + | EXCLMARK unaryexpression { } + | castexpression{ } exclusiveorexpression : andexpression { } - | exclusiveorexpression XOR andexpression { } + | exclusiveorexpression XOR andexpression { } -literal : INTLITERAL { } - | BOOLLITERAL { } - | CHARLITERAL { } - | STRINGLITERAL { } - | JNULL { } +literal : INTLITERAL { } + | BOOLLITERAL { } + | CHARLITERAL { } + | JNULL { } -castexpression : LBRACE primitivetype RBRACE unaryexpression { } - | LBRACE expression RBRACE unaryexpressionnotplusminus{ } +castexpression : LBRACE primitivetype RBRACE unaryexpression { } + | LBRACE expression RBRACE unaryexpressionnotplusminus{ } andexpression : equalityexpression { } - | andexpression AND equalityexpression { } + | andexpression AND equalityexpression { } equalityexpression : relationalexpression { } - | equalityexpression EQUAL relationalexpression { } - | equalityexpression NOTEQUAL relationalexpression { } + | equalityexpression EQUAL relationalexpression { } + | equalityexpression NOTEQUAL relationalexpression { } relationalexpression : shiftexpression { } - | relationalexpression LESS shiftexpression { } - | relationalexpression GREATER shiftexpression { } - | relationalexpression LESSEQUAL shiftexpression { } - | relationalexpression GREATEREQUAL shiftexpression { } - | relationalexpression INSTANCEOF referencetype { } + | relationalexpression LESS shiftexpression { } + | relationalexpression GREATER shiftexpression { } + | relationalexpression LESSEQUAL shiftexpression { } + | relationalexpression GREATEREQUAL shiftexpression { } + | relationalexpression INSTANCEOF referencetype { } -shiftexpression : additiveexpression { } +shiftexpression : additiveexpression { } additiveexpression : multiplicativeexpression { } - | additiveexpression PLUS multiplicativeexpression { } - | additiveexpression MINUS multiplicativeexpression { } + | additiveexpression PLUS multiplicativeexpression { } + | additiveexpression MINUS multiplicativeexpression { } multiplicativeexpression : unaryexpression { } - | multiplicativeexpression MUL unaryexpression { } - | multiplicativeexpression DIV unaryexpression { } - | multiplicativeexpression MOD unaryexpression { } + | multiplicativeexpression MUL unaryexpression { } + | multiplicativeexpression DIV unaryexpression { } + | multiplicativeexpression MOD unaryexpression { } {