Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preproc stage 1 #64

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Preproc stage 1 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1291872
Добавление парсера для препроцессора. Очистка BSLParser от инструкций…
MinimaJack May 19, 2020
c80a6b4
Убрал CaseChangingCharStream
MinimaJack May 19, 2020
4cfcee4
Add list with regions to compilation result in test
MinimaJack May 20, 2020
c8fe0da
Добавление параметра для принудительного возврата всех токенов
MinimaJack May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 10 additions & 71 deletions src/main/antlr/BSLParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,72 +27,11 @@ options {
}

// ROOT
file: shebang? preprocessor* moduleVars? preprocessor* (fileCodeBlockBeforeSub subs)? fileCodeBlock EOF;
file: shebang? moduleVars? (fileCodeBlockBeforeSub subs)? fileCodeBlock EOF;

// preprocessor
shebang : HASH PREPROC_EXCLAMATION_MARK (PREPROC_ANY | PREPROC_IDENTIFIER)*;

usedLib : (PREPROC_STRING | PREPROC_IDENTIFIER);
use : PREPROC_USE_KEYWORD usedLib;

regionStart : PREPROC_REGION regionName;
regionEnd : PREPROC_END_REGION;
regionName : PREPROC_IDENTIFIER;

preproc_if : PREPROC_IF_KEYWORD preproc_expression PREPROC_THEN_KEYWORD;
preproc_elsif : PREPROC_ELSIF_KEYWORD preproc_expression PREPROC_THEN_KEYWORD;
preproc_else : PREPROC_ELSE_KEYWORD;
preproc_endif : PREPROC_ENDIF_KEYWORD;

preproc_expression
: ( PREPROC_NOT_KEYWORD? (PREPROC_LPAREN preproc_expression PREPROC_RPAREN ) )
| preproc_logicalExpression
;
preproc_logicalOperand
: (PREPROC_LPAREN PREPROC_NOT_KEYWORD? preproc_logicalOperand PREPROC_RPAREN)
| ( PREPROC_NOT_KEYWORD? preproc_symbol )
;
preproc_logicalExpression
: preproc_logicalOperand (preproc_boolOperation preproc_logicalOperand)*;
preproc_symbol
: PREPROC_CLIENT_SYMBOL
| PREPROC_ATCLIENT_SYMBOL
| PREPROC_SERVER_SYMBOL
| PREPROC_ATSERVER_SYMBOL
| PREPROC_MOBILEAPPCLIENT_SYMBOL
| PREPROC_MOBILEAPPSERVER_SYMBOL
| PREPROC_MOBILECLIENT_SYMBOL
| PREPROC_THICKCLIENTORDINARYAPPLICATION_SYMBOL
| PREPROC_THICKCLIENTMANAGEDAPPLICATION_SYMBOL
| PREPROC_EXTERNALCONNECTION_SYMBOL
| PREPROC_THINCLIENT_SYMBOL
| PREPROC_WEBCLIENT_SYMBOL
| PREPROC_INSERT_SYMBOL
| PREPROC_ENDINSERT_SYMBOL
| PREPROC_DELETE_SYMBOL
| PREPROC_ENDDELETE_SYMBOL
| preproc_unknownSymbol
;
preproc_unknownSymbol
: PREPROC_IDENTIFIER
;
preproc_boolOperation
: PREPROC_OR_KEYWORD
| PREPROC_AND_KEYWORD
;

preprocessor
: HASH
(regionStart
| regionEnd
| preproc_if
| preproc_elsif
| preproc_else
| preproc_endif
| use
)
;

// compiler directives
compilerDirectiveSymbol
: ANNOTATION_ATSERVERNOCONTEXT_SYMBOL
Expand Down Expand Up @@ -137,12 +76,12 @@ annotationParam
var_name : IDENTIFIER;

moduleVars : moduleVar+;
moduleVar : (preprocessor | compilerDirective | annotation)* VAR_KEYWORD moduleVarsList SEMICOLON?;
moduleVar : (compilerDirective | annotation)* VAR_KEYWORD moduleVarsList SEMICOLON?;
moduleVarsList : moduleVarDeclaration (COMMA moduleVarDeclaration)*;
moduleVarDeclaration: var_name EXPORT_KEYWORD?;

subVars : subVar+;
subVar : (preprocessor | compilerDirective | annotation)* VAR_KEYWORD subVarsList SEMICOLON?;
subVar : (compilerDirective | annotation)* VAR_KEYWORD subVarsList SEMICOLON?;
subVarsList : subVarDeclaration (COMMA subVarDeclaration)*;
subVarDeclaration: var_name;

Expand All @@ -153,8 +92,8 @@ subs : sub+;
sub : procedure | function;
procedure : procDeclaration subCodeBlock ENDPROCEDURE_KEYWORD;
function : funcDeclaration subCodeBlock ENDFUNCTION_KEYWORD;
procDeclaration : (preprocessor | compilerDirective | annotation)* PROCEDURE_KEYWORD subName LPAREN paramList? RPAREN EXPORT_KEYWORD?;
funcDeclaration : (preprocessor | compilerDirective | annotation)* FUNCTION_KEYWORD subName LPAREN paramList? RPAREN EXPORT_KEYWORD?;
procDeclaration : (compilerDirective | annotation)* PROCEDURE_KEYWORD subName LPAREN paramList? RPAREN EXPORT_KEYWORD?;
funcDeclaration : (compilerDirective | annotation)* FUNCTION_KEYWORD subName LPAREN paramList? RPAREN EXPORT_KEYWORD?;
subCodeBlock : subVars? codeBlock;

// statements
Expand Down Expand Up @@ -211,7 +150,7 @@ fileCodeBlockBeforeSub
fileCodeBlock
: codeBlock
;
codeBlock : (statement | preprocessor)*;
codeBlock : statement*;
numeric : FLOAT | DECIMAL;
paramList : param (COMMA param)*;
param : VAL_KEYWORD? IDENTIFIER (ASSIGN defaultValue)?;
Expand All @@ -222,18 +161,18 @@ string : (STRING | multilineString)+;
statement
: (
(
( label (callStatement | compoundStatement | assignment | preprocessor)?)
( label (callStatement | compoundStatement | assignment)?)
|
(callStatement | compoundStatement | assignment| preprocessor)
(callStatement | compoundStatement | assignment)
)
SEMICOLON?
)
| SEMICOLON
;
assignment : lValue preprocessor* ASSIGN (preprocessor* expression)?;
assignment : lValue ASSIGN expression?;
callParamList : callParam (COMMA callParam)*;
callParam : expression?;
expression : member (preprocessor* operation preprocessor* member)*;
expression : member ( operation member)*;
operation : PLUS | MINUS | MUL | QUOTIENT | MODULO | boolOperation | compareOperation;
compareOperation : LESS | LESS_OR_EQUAL | GREATER | GREATER_OR_EQUAL | ASSIGN | NOT_EQUAL;
boolOperation : OR_KEYWORD | AND_KEYWORD;
Expand Down
138 changes: 138 additions & 0 deletions src/main/antlr/BSLPreprocessorParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
/**
* This file is a part of BSL Parser.
*
* Copyright © 2018-2020
* Alexey Sosnoviy <[email protected]>, Nikita Gryzlov <[email protected]>, Sergey Batanov <[email protected]>
*
* SPDX-License-Identifier: LGPL-3.0-or-later
*
* BSL Parser is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* BSL Parser is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with BSL Parser.
*/
parser grammar BSLPreprocessorParser;

options {
tokenVocab = BSLLexer;
contextSuperClass = 'BSLParserRuleContext';
}

@parser::header
{
import java.util.Stack;
import java.util.HashSet;
}

@parser::members
{
Stack<Boolean> conditions = new Stack<Boolean>();
public HashSet<String> predefinedSymbols = new HashSet<String>();

private boolean allConditions() {
for(boolean condition: conditions) {
if (!condition)
return false;
}
return true;
}
}


// preprocessor
shebang : HASH PREPROC_EXCLAMATION_MARK (PREPROC_ANY | PREPROC_IDENTIFIER)*;

preprocessor : HASH preprocessor_directive[true];

preprocessor_directive [boolean value]
: PREPROC_IF_KEYWORD expr=preproc_expression PREPROC_THEN_KEYWORD
{
if ($expr.value == null) $value = false;
else {
$value = $expr.value.equals("true") && allConditions();
conditions.push($expr.value.equals("true"));
}
}
| PREPROC_ELSIF_KEYWORD expr=preproc_expression PREPROC_THEN_KEYWORD
{
if (!conditions.peek()) {
conditions.pop();
$value = $expr.value.equals("true") && allConditions();
conditions.push($expr.value.equals("true"));
} else $value = false;
}
| PREPROC_ELSE_KEYWORD
{
if (!conditions.peek()) {
conditions.pop();
$value = true && allConditions();
conditions.push(true);
} else $value = false;
}
| PREPROC_ENDIF_KEYWORD
{
conditions.pop();
try {
$value = conditions.peek();
} catch (Exception e) {
_errHandler.reportMatch(this);
}
}
| PREPROC_REGION regionName=PREPROC_IDENTIFIER
{ $value = allConditions(); }
| PREPROC_END_REGION
{ $value = allConditions(); }
| PREPROC_INSERT_SYMBOL
{ $value = allConditions(); }
| PREPROC_ENDINSERT_SYMBOL
{ $value = allConditions(); }
| PREPROC_DELETE_SYMBOL
{ $value = allConditions(); }
| PREPROC_ENDDELETE_SYMBOL
{ $value = allConditions(); }
| PREPROC_USE_KEYWORD usedLib=(PREPROC_STRING | PREPROC_IDENTIFIER)
{ $value = allConditions(); };

preproc_expression returns [String value]
: PREPROC_LPAREN expr=preproc_expression PREPROC_RPAREN
{ $value = $expr.value; }
| preproc_symbol
{
if($preproc_symbol.start.getType() == BSLLexer.PREPROC_IDENTIFIER){
$value = predefinedSymbols.contains($preproc_symbol.text.toLowerCase())? "true" : "false";
}else{
$value = predefinedSymbols.contains(VOCABULARY.getSymbolicName($preproc_symbol.start.getType())) ? "true" : "false";
}
}
| PREPROC_NOT_KEYWORD expr=preproc_expression
{ $value = $expr.value.equals("true") ? "false" : "true"; }
| expr1=preproc_expression PREPROC_AND_KEYWORD expr2=preproc_expression
{ $value = ($expr1.value.equals("true") && $expr2.value.equals("true") ? "true" : "false"); }
| expr1=preproc_expression PREPROC_OR_KEYWORD expr2=preproc_expression
{ $value = ($expr1.value.equals("true") || $expr2.value.equals("true") ? "true" : "false"); }
;

preproc_symbol
: PREPROC_CLIENT_SYMBOL #symbol
| PREPROC_ATCLIENT_SYMBOL #symbol
| PREPROC_SERVER_SYMBOL #symbol
| PREPROC_ATSERVER_SYMBOL #symbol
| PREPROC_MOBILEAPPCLIENT_SYMBOL #symbol
| PREPROC_MOBILEAPPSERVER_SYMBOL #symbol
| PREPROC_MOBILECLIENT_SYMBOL #symbol
| PREPROC_THICKCLIENTORDINARYAPPLICATION_SYMBOL #symbol
| PREPROC_THICKCLIENTMANAGEDAPPLICATION_SYMBOL #symbol
| PREPROC_EXTERNALCONNECTION_SYMBOL #symbol
| PREPROC_THINCLIENT_SYMBOL #symbol
| PREPROC_WEBCLIENT_SYMBOL #symbol
| PREPROC_IDENTIFIER #unksymbol
;

28 changes: 15 additions & 13 deletions src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ void testFile() {
"Сообщить();\n"
);
assertMatches(parser.file());

setInput("#!\n" +
/* TODO Fix me
setInput("#!os\n" +
"#Если Сервер Тогда\n" +
"Перем А; \n" +
"Перем Б; \n" +
Expand All @@ -158,7 +158,7 @@ void testFile() {
"Сообщить();\n" +
"#КонецЕсли\n"
);
assertMatches(parser.file());
assertMatches(parser.file());*/

}

Expand All @@ -175,7 +175,7 @@ void testShebang() {
assertNotMatches(parser.shebang());

}

/*
@Test
void testUse() {
setInput("Использовать lib", BSLLexer.PREPROCESSOR_MODE);
Expand Down Expand Up @@ -242,7 +242,7 @@ void testPreproc_endif() {
setInput("ИначеЕсли", BSLLexer.PREPROCESSOR_MODE);
assertNotMatches(parser.preproc_endif());

}
}*/

@Test
void testPreproc_Expression() {
Expand All @@ -251,7 +251,7 @@ void testPreproc_Expression() {

@Test
void testPreproc_symbol() {

/*
setInput("Клиент", BSLLexer.PREPROCESSOR_MODE);
assertMatches(parser.preproc_symbol());

Expand Down Expand Up @@ -305,12 +305,12 @@ void testPreproc_symbol() {

setInput("Сервер", BSLLexer.PREPROCESSOR_MODE);
assertNotMatches(parser.preproc_unknownSymbol());

*/
}

@Test
void TestPreproc_boolOperation() {

/*
setInput("И", BSLLexer.PREPROCESSOR_MODE);
assertMatches(parser.preproc_boolOperation());

Expand All @@ -319,13 +319,13 @@ void TestPreproc_boolOperation() {

setInput("НЕ", BSLLexer.PREPROCESSOR_MODE);
assertNotMatches(parser.preproc_boolOperation());

*/
}

@Test
void TestPreprocessor() {

setInput("#Область А");
/*setInput("#Область А");
assertMatches(parser.preprocessor());

setInput("#КонецОбласти");
Expand All @@ -351,7 +351,7 @@ void TestPreprocessor() {

setInput("Просто");
assertNotMatches(parser.preprocessor());

*/
}

@Test
Expand Down Expand Up @@ -408,7 +408,7 @@ void moduleVar() {
setInput("&Аннотация\n&ВтораяАннотация\nПерем ИмяПерем");
assertMatches(parser.moduleVar());

setInput("&Аннотация\n#Область ИмяОбласти\n&ВтораяАннотация\nПерем ИмяПерем");
setInput("&Аннотация\n&ВтораяАннотация\nПерем ИмяПерем");
assertMatches(parser.moduleVar());
}

Expand Down Expand Up @@ -648,6 +648,8 @@ void testExpression() {
setInput("A = 1 -+ 2");
assertMatches(parser.expression());

//TODO Fix me
/*
setInput("A1 + \n" +
"#Если (Клиент) Тогда\n" +
"А +\n" +
Expand All @@ -663,7 +665,7 @@ void testExpression() {
"#КонецОбласти\n" +
"#КонецЕсли\n" +
"+ С\n");
assertMatches(parser.expression());
assertMatches(parser.expression());*/

setInput("Метод()");
assertMatches(parser.expression());
Expand Down
Loading