From c2d2df93062478675eba8a28b33472461973b0e5 Mon Sep 17 00:00:00 2001 From: Franck Fleurey Date: Mon, 15 Jun 2020 16:35:12 +0200 Subject: [PATCH] fix in annotation registry --- .../xtext-resources/generated/mode-thingml.js | 16 ---------------- .../thingml/annotations/AnnotationRegistry.java | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/language/thingml.web/WebRoot/xtext-resources/generated/mode-thingml.js b/language/thingml.web/WebRoot/xtext-resources/generated/mode-thingml.js index 134847b47..2ed1b7177 100644 --- a/language/thingml.web/WebRoot/xtext-resources/generated/mode-thingml.js +++ b/language/thingml.web/WebRoot/xtext-resources/generated/mode-thingml.js @@ -1,19 +1,3 @@ -/* - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * See the NOTICE file distributed with this work for additional - * information regarding copyright ownership. - */ define(["ace/lib/oop", "ace/mode/text", "ace/mode/text_highlight_rules"], function(oop, mText, mTextHighlightRules) { var HighlightRules = function() { var keywords = "abstract|action|and|as|composite|configuration|connector|datatype|do|else|end|entry|enumeration|error|errorln|event|exit|false|final|for|fork|fragment|from|function|guard|history|if|import|in|includes|init|instance|internal|keeps|message|not|object|on|optional|or|over|port|print|println|property|protocol|provided|readonly|receives|region|required|return|sends|session|set|state|statechart|thing|transition|true|var|while"; diff --git a/language/thingml/src/org/thingml/annotations/AnnotationRegistry.java b/language/thingml/src/org/thingml/annotations/AnnotationRegistry.java index a6d7e2aeb..ba36fbc77 100644 --- a/language/thingml/src/org/thingml/annotations/AnnotationRegistry.java +++ b/language/thingml/src/org/thingml/annotations/AnnotationRegistry.java @@ -175,14 +175,14 @@ public class AnnotationRegistry { //@add_c_libraries final String add_c_libraries_name = "add_c_libraries"; final String add_c_libraries_desc = "Adds a lib to the generated Makefile."; - final EClass add_c_libraries_scope[] = {ThingMLPackage.eINSTANCE.getThing()}; + final EClass add_c_libraries_scope[] = {ThingMLPackage.eINSTANCE.getThing(), ThingMLPackage.eINSTANCE.getConfiguration()}; final Annotation add_c_libraries_annotation = new Annotation(add_c_libraries_name, add_c_libraries_desc, add_c_libraries_scope); annotations.put(add_c_libraries_name, add_c_libraries_annotation); //@add_c_modules final String add_c_modules_name = "add_c_modules"; final String add_c_modules_desc = "Copy .c .h and add them to the generated Makefile"; - final EClass add_c_modules_scope[] = {ThingMLPackage.eINSTANCE.getThing()}; + final EClass add_c_modules_scope[] = {ThingMLPackage.eINSTANCE.getThing(), ThingMLPackage.eINSTANCE.getConfiguration()}; final Annotation add_c_modules_annotation = new Annotation(add_c_modules_name, add_c_modules_desc, add_c_modules_scope); annotations.put(add_c_modules_name, add_c_modules_annotation);