diff --git a/formatting-styles/gtk/sarl.lang b/formatting-styles/gtk/sarl.lang index 492e8d51cd..221cb18d2b 100644 --- a/formatting-styles/gtk/sarl.lang +++ b/formatting-styles/gtk/sarl.lang @@ -24,7 +24,7 @@ limitations under the License. --> - + diff --git a/formatting-styles/latex/sarl-beamer-listing.sty b/formatting-styles/latex/sarl-beamer-listing.sty index b187621f03..06bd03d902 100644 --- a/formatting-styles/latex/sarl-beamer-listing.sty +++ b/formatting-styles/latex/sarl-beamer-listing.sty @@ -22,7 +22,7 @@ % limitations under the License. % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sarl-beamer-listing}[2018/02/15] +\ProvidesPackage{sarl-beamer-listing}[2018/05/28] \newif\ifusesarlcolors\usesarlcolorstrue \DeclareOption{sarlcolors}{\global\usesarlcolorstrue} \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse} @@ -76,7 +76,7 @@ } \newcommand{\code}[1]{\ifmmode\text{\lstinline[basicstyle=\usebeamertemplate{code inline style}]{#1}}\else\lstinline[basicstyle=\usebeamertemplate{code inline style}]{#1}\fi} \newcommand{\sarl}{\mbox{SARL}\xspace} -\newcommand{\sarlversion}{0.7} +\newcommand{\sarlversion}{0.8} \ifusesarlcolors \setbeamercolor*{code keyword}{fg=SARLkeyword} \setbeamercolor*{code string}{fg=SARLstring} diff --git a/formatting-styles/latex/sarl-colorized-listing.sty b/formatting-styles/latex/sarl-colorized-listing.sty index 57a846729a..5528fd4db1 100644 --- a/formatting-styles/latex/sarl-colorized-listing.sty +++ b/formatting-styles/latex/sarl-colorized-listing.sty @@ -22,7 +22,7 @@ % limitations under the License. % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sarl-colorized-listing}[2018/02/15] +\ProvidesPackage{sarl-colorized-listing}[2018/05/28] \newif\ifusesarlcolors\usesarlcolorstrue \DeclareOption{sarlcolors}{\global\usesarlcolorstrue} \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse} @@ -81,5 +81,5 @@ } \newcommand{\code}[1]{\ifmmode\text{\lstinline[basicstyle=\normalcolor]{#1}}\else\lstinline[basicstyle=\normalcolor]{#1}\fi} \newcommand{\sarl}{\mbox{SARL}\xspace} -\newcommand{\sarlversion}{0.7} +\newcommand{\sarlversion}{0.8} \endinput diff --git a/formatting-styles/latex/sarl-listing.sty b/formatting-styles/latex/sarl-listing.sty index c41b68453c..cd23bfb549 100644 --- a/formatting-styles/latex/sarl-listing.sty +++ b/formatting-styles/latex/sarl-listing.sty @@ -22,7 +22,7 @@ % limitations under the License. % \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{sarl-listing}[2018/02/15] +\ProvidesPackage{sarl-listing}[2018/05/28] \newif\ifusesarlcolors\usesarlcolorstrue \DeclareOption{sarlcolors}{\global\usesarlcolorstrue} \DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse} @@ -67,5 +67,5 @@ } \newcommand{\code}[1]{\ifmmode\text{\lstinline[basicstyle=\normalcolor]{#1}}\else\lstinline[basicstyle=\normalcolor]{#1}\fi} \newcommand{\sarl}{\mbox{SARL}\xspace} -\newcommand{\sarlversion}{0.7} +\newcommand{\sarlversion}{0.8} \endinput diff --git a/formatting-styles/prettify/lang-sarl.js b/formatting-styles/prettify/lang-sarl.js index 96dc4e377e..e9c9a4c2f4 100644 --- a/formatting-styles/prettify/lang-sarl.js +++ b/formatting-styles/prettify/lang-sarl.js @@ -23,7 +23,7 @@ * limitations under the License. * */ -/* Style for SARL 0.7 */ +/* Style for SARL 0.8 */ PR['registerLangHandler']( PR['createSimpleLexer']( diff --git a/formatting-styles/pygments/sarllexer/__init__.py b/formatting-styles/pygments/sarllexer/__init__.py index ce5a5de09e..f1d06ec8ed 100644 --- a/formatting-styles/pygments/sarllexer/__init__.py +++ b/formatting-styles/pygments/sarllexer/__init__.py @@ -22,7 +22,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Style for SARL 0.7 +# Style for SARL 0.8 __all__ = [ ] diff --git a/formatting-styles/pygments/sarllexer/sarl.py b/formatting-styles/pygments/sarllexer/sarl.py index 94806ca09c..93b008fbb9 100644 --- a/formatting-styles/pygments/sarllexer/sarl.py +++ b/formatting-styles/pygments/sarllexer/sarl.py @@ -22,7 +22,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Style for SARL 0.7 +# Style for SARL 0.8 import re @@ -34,7 +34,7 @@ class SarlLexer(RegexLexer): """ For `SARL `_ source code. - .. versionadded:: 0.7 + .. versionadded:: 0.8 """ name = 'SARL' diff --git a/formatting-styles/pygments/setup.py b/formatting-styles/pygments/setup.py index 6851b1f5ac..760648b05c 100644 --- a/formatting-styles/pygments/setup.py +++ b/formatting-styles/pygments/setup.py @@ -22,14 +22,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Style for SARL 0.7 +# Style for SARL 0.8 from setuptools import setup setup ( name='sarl.pylexer', - version='0.7', + version='0.8', packages=['sarl.pylexer'], entry_points = """ diff --git a/formatting-styles/source-highlight/sarl.lang b/formatting-styles/source-highlight/sarl.lang index c6e233933c..bdb08356ea 100644 --- a/formatting-styles/source-highlight/sarl.lang +++ b/formatting-styles/source-highlight/sarl.lang @@ -21,7 +21,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Style for SARL 0.7 +# Style for SARL 0.8 preproc = "import","package" diff --git a/formatting-styles/vim/ftdetect/sarl.vim b/formatting-styles/vim/ftdetect/sarl.vim index bb6b74b5fa..ded8232fd2 100644 --- a/formatting-styles/vim/ftdetect/sarl.vim +++ b/formatting-styles/vim/ftdetect/sarl.vim @@ -1,5 +1,5 @@ " Vim filetype-detection file " Language: SARL -" Version: 0.7 +" Version: 0.8 au BufRead,BufNewFile *.sarl set filetype=sarl diff --git a/formatting-styles/vim/syntax/sarl.vim b/formatting-styles/vim/syntax/sarl.vim index ef9621b9b0..ae64fb692b 100644 --- a/formatting-styles/vim/syntax/sarl.vim +++ b/formatting-styles/vim/syntax/sarl.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: SARL -" Version: 0.7 +" Version: 0.8 " " $Id$ " diff --git a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/TopElementBuilderFragment.java b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/TopElementBuilderFragment.java index 9c5bf06b21..45660662af 100644 --- a/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/TopElementBuilderFragment.java +++ b/main/coreplugins/io.sarl.lang.mwe2/src/io/sarl/lang/mwe2/codebuilder/fragments/TopElementBuilderFragment.java @@ -1375,10 +1375,12 @@ protected void appendTo(TargetStringConcatenation it) { it.append(".setExtends(superTypeRef);"); //$NON-NLS-1$ } it.newLine(); - if (!Strings.isEmpty(defaultType) && !isExtendsKeywordFound.get()) { + if (!Strings.isEmpty(defaultType)) { it.append("\t\t\t\treturn;"); //$NON-NLS-1$ - it.newLine(); + } else { + it.append("\t\t\treturn;"); //$NON-NLS-1$ } + it.newLine(); if (!Strings.isEmpty(defaultType)) { it.append("\t\t\t}"); //$NON-NLS-1$ it.newLine(); diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlCapacityBuilderImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlCapacityBuilderImpl.java index 06858e808d..0fd4f3be6b 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlCapacityBuilderImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlCapacityBuilderImpl.java @@ -117,6 +117,7 @@ public void addExtends(String superType) { JvmTypeReference baseTypeRef = findType(this.sarlCapacity, Capacity.class.getCanonicalName()); if (isSubTypeOf(this.sarlCapacity, superTypeRef, baseTypeRef)) { this.sarlCapacity.getExtends().add(superTypeRef); + return; } } } diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlClassBuilderImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlClassBuilderImpl.java index e56fd4683b..4b770453e8 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlClassBuilderImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlClassBuilderImpl.java @@ -131,6 +131,7 @@ public void setExtends(String superType) { if (!Strings.isEmpty(superType)) { JvmParameterizedTypeReference superTypeRef = newTypeRef(this.container, superType); this.sarlClass.setExtends(superTypeRef); + return; } this.sarlClass.setExtends(null); } diff --git a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlInterfaceBuilderImpl.java b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlInterfaceBuilderImpl.java index fd148a67a4..46983070a7 100644 --- a/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlInterfaceBuilderImpl.java +++ b/main/coreplugins/io.sarl.lang/src-gen/io/sarl/lang/codebuilder/builders/SarlInterfaceBuilderImpl.java @@ -130,6 +130,7 @@ public void addExtends(String superType) { if (!Strings.isEmpty(superType)) { JvmParameterizedTypeReference superTypeRef = newTypeRef(this.container, superType); this.sarlInterface.getExtends().add(superTypeRef); + return; } }