From b410b406a3aa9f4ee00b5d54e6d0579ee132c9a4 Mon Sep 17 00:00:00 2001
From: Botond Baranyi <botond.baranyi@ericsson.com>
Date: Tue, 19 Nov 2019 12:54:43 +0100
Subject: [PATCH] Disabled OOP compiler option for the release
Change-Id: I08adccdcce44bf6c0ccaec7c84bf0bb8f3bdd73d
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>
---
compiler2/main.cc | 5 ++++-
compiler2/ttcn3/compiler.l | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/compiler2/main.cc b/compiler2/main.cc
index 6e4254a56..7aa15b468 100644
--- a/compiler2/main.cc
+++ b/compiler2/main.cc
@@ -682,7 +682,10 @@ int main(int argc, char *argv[])
break;
case 'k':
SET_FLAG(k);
- oop_features = TRUE;
+ //oop_features = TRUE;
+ // disabled for the release
+ errflag = true;
+ print_usage = true;
break;
case 'K':
SET_FLAG(K);
diff --git a/compiler2/ttcn3/compiler.l b/compiler2/ttcn3/compiler.l
index a70536cb4..1a157ec2d 100644
--- a/compiler2/ttcn3/compiler.l
+++ b/compiler2/ttcn3/compiler.l
@@ -563,9 +563,9 @@ class {
RETURN(ClassKeyword);
}
else {
- Location loc(infile, yylloc);
+ /*Location loc(infile, yylloc);
loc.warning("Keyword 'class' is treated as an identifier. Activate "
- "compiler option '-k' to use object-oriented features.");
+ "compiler option '-k' to use object-oriented features.");*/
yylval.id = new Identifier(Identifier::ID_TTCN, string(yyleng, yytext));
RETURN_LVAL(IDentifier);
}
@@ -575,9 +575,9 @@ finally {
RETURN(FinallyKeyword);
}
else {
- Location loc(infile, yylloc);
+ /*Location loc(infile, yylloc);
loc.warning("Keyword 'finally' is treated as an identifier. Activate "
- "compiler option '-k' to use object-oriented features.");
+ "compiler option '-k' to use object-oriented features.");*/
yylval.id = new Identifier(Identifier::ID_TTCN, string(yyleng, yytext));
RETURN_LVAL(IDentifier);
}
--
GitLab