From e6f41cfd93061bbea165c52ac4ffd29501877a3e Mon Sep 17 00:00:00 2001 From: idhugoid Date: Mon, 5 Oct 2020 11:09:52 +0200 Subject: [PATCH] Adds strict checking to the parser/tc settings In bca2a6a the strict flag was set only to launches and builds, thus the flag is not set when the parser/tc is called while typing. This commit fixes that. --- .../java/org/overture/ide/parsers/vdmj/SourceParserVdmPp.java | 1 + .../java/org/overture/ide/parsers/vdmj/SourceParserVdmSl.java | 1 + .../debug/ui/launching/VdmPpMainLaunchConfigurationTab.java | 1 + .../debug/ui/launching/VdmRtMainLaunchConfigurationTab.java | 1 + .../debug/ui/launching/VdmSlMainLaunchConfigurationTab.java | 1 + 5 files changed, 5 insertions(+) diff --git a/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmPp.java b/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmPp.java index 9b1ba0b612..5c8d7796ab 100644 --- a/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmPp.java +++ b/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmPp.java @@ -59,6 +59,7 @@ protected ParseResult startParseFile(IVdmSourceUnit file, String source, try { Settings.release = file.getProject().getLanguageVersion(); + Settings.strict = file.getProject().hasUseStrictLetDef(); } catch (CoreException e1) { if (Activator.DEBUG) diff --git a/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmSl.java b/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmSl.java index f2e2f4c7d4..85c703b040 100644 --- a/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmSl.java +++ b/ide/parsers/vdmj/src/main/java/org/overture/ide/parsers/vdmj/SourceParserVdmSl.java @@ -52,6 +52,7 @@ protected ParseResult startParse(IVdmSourceUnit file, String source, try { Settings.release = file.getProject().getLanguageVersion(); + Settings.strict = file.getProject().hasUseStrictLetDef(); } catch (CoreException e1) { if (Activator.DEBUG) diff --git a/ide/vdmpp/debug/src/main/java/org/overture/ide/vdmpp/debug/ui/launching/VdmPpMainLaunchConfigurationTab.java b/ide/vdmpp/debug/src/main/java/org/overture/ide/vdmpp/debug/ui/launching/VdmPpMainLaunchConfigurationTab.java index 471d61329b..4b2f999383 100644 --- a/ide/vdmpp/debug/src/main/java/org/overture/ide/vdmpp/debug/ui/launching/VdmPpMainLaunchConfigurationTab.java +++ b/ide/vdmpp/debug/src/main/java/org/overture/ide/vdmpp/debug/ui/launching/VdmPpMainLaunchConfigurationTab.java @@ -66,6 +66,7 @@ protected boolean validateTypes(IVdmProject project, String expression) { Settings.dialect = Dialect.VDM_PP; Settings.release = project.getLanguageVersion(); + Settings.strict = project.hasUseStrictLetDef(); Console.charset = getProject().getDefaultCharset(); IVdmModel model = project.getModel(); if (!model.isTypeCorrect()) diff --git a/ide/vdmrt/debug/src/main/java/org/overture/ide/vdmrt/debug/ui/launching/VdmRtMainLaunchConfigurationTab.java b/ide/vdmrt/debug/src/main/java/org/overture/ide/vdmrt/debug/ui/launching/VdmRtMainLaunchConfigurationTab.java index 9ea4e75023..41bee314a3 100644 --- a/ide/vdmrt/debug/src/main/java/org/overture/ide/vdmrt/debug/ui/launching/VdmRtMainLaunchConfigurationTab.java +++ b/ide/vdmrt/debug/src/main/java/org/overture/ide/vdmrt/debug/ui/launching/VdmRtMainLaunchConfigurationTab.java @@ -66,6 +66,7 @@ protected boolean validateTypes(IVdmProject project, String expression) { Settings.dialect = Dialect.VDM_RT; Settings.release = project.getLanguageVersion(); + Settings.strict = project.hasUseStrictLetDef(); Console.charset = getProject().getDefaultCharset(); IVdmModel model = project.getModel(); if (!model.isTypeCorrect()) diff --git a/ide/vdmsl/debug/src/main/java/org/overture/ide/vdmsl/debug/ui/launching/VdmSlMainLaunchConfigurationTab.java b/ide/vdmsl/debug/src/main/java/org/overture/ide/vdmsl/debug/ui/launching/VdmSlMainLaunchConfigurationTab.java index 31096e0734..4b5df5a72e 100644 --- a/ide/vdmsl/debug/src/main/java/org/overture/ide/vdmsl/debug/ui/launching/VdmSlMainLaunchConfigurationTab.java +++ b/ide/vdmsl/debug/src/main/java/org/overture/ide/vdmsl/debug/ui/launching/VdmSlMainLaunchConfigurationTab.java @@ -62,6 +62,7 @@ protected boolean validateTypes(IVdmProject project, String expression) { Settings.dialect = Dialect.VDM_SL; Settings.release = project.getLanguageVersion(); + Settings.strict = project.hasUseStrictLetDef(); Console.charset = getProject().getDefaultCharset(); IVdmModel model = project.getModel(); if (!model.isTypeCorrect())