[openrtm-commit:02873] r773 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder: src/jp/go/aist/rtm/rtcbuilder src/jp/go/aist/rtm/rtcbuilder/generator src/jp/go/aist/rtm/rtcbuilder/generator/param src/jp/go/aist/rtm/rtcbuilder/generator/param/idl src/jp/go/aist/rtm/rtcbuilder/ui/editors test/jp/go/aist/rtm/rtcbuilder/_test/_100 test/jp/go/aist/rtm/rtcbuilder/_test/com test/jp/go/aist/rtm/rtcbuilder/_test/cxx
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 10月 15日 (日) 22:22:26 JST
Author: ga
Date: 2017-10-15 22:22:26 +0900 (Sun, 15 Oct 2017)
New Revision: 773
Added:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/HeaderException.java
Modified:
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/GuiRtcBuilder.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/GeneratorParam.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ServicePortEditorFormPage.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLuckTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/cxx/PreProcessorTest.java
Log:
Changed check method for IDL #4267
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/Generator.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -24,6 +24,7 @@
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.ParseException;
import jp.go.aist.rtm.rtcbuilder.corba.idl.parser.syntaxtree.specification;
import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.rtcbuilder.generator.HeaderException;
import jp.go.aist.rtm.rtcbuilder.generator.IDLParamConverter;
import jp.go.aist.rtm.rtcbuilder.generator.PreProcessor;
import jp.go.aist.rtm.rtcbuilder.generator.param.ConfigSetParam;
@@ -66,6 +67,7 @@
private static final Logger LOGGER = LoggerFactory
.getLogger(Generator.class);
+ private String warningMessage = "";
Map<String, GenerateManager> generateManagerList = new HashMap<String, GenerateManager>();
@@ -75,6 +77,10 @@
this.addGenerateManager(new CMakeGenerateManager());
}
+ public String getWarningMessage() {
+ return warningMessage;
+ }
+
/**
* ジェネレート・マネージャを追加する
*
@@ -93,11 +99,37 @@
generateManagerList.clear();
}
- public List<GeneratedResult> generateTemplateCode(
- GeneratorParam generatorParam) throws Exception {
- return generateTemplateCode(generatorParam, null, true);
+ public List<GeneratedResult> generateTemplateCode(GeneratorParam generatorParam) throws Exception {
+ validate(generatorParam.getRtcParam());
+ return generateTemplateCode(generatorParam, null);
}
+ public void validateIDLDef(GeneratorParam generatorParam, List<String> idlDir) throws Exception {
+ List<String> IDLPathes = new ArrayList<String>();
+ List<ServiceClassParam> IDLPathParams = new ArrayList<ServiceClassParam>();
+
+ RtcParam rtcParam = generatorParam.getRtcParam();
+ rtcParam.checkAndSetParameter();
+ rtcParam.getIdlPathes().clear();
+ for( ServicePortParam serviceport : rtcParam.getServicePorts() ) {
+ for( ServicePortInterfaceParam serviceInterfaces : serviceport.getServicePortInterfaces() ) {
+ if( !IDLPathes.contains(serviceInterfaces.getIdlFullPath()) ) {
+ IDLPathes.add(serviceInterfaces.getIdlFullPath());
+ IDLPathParams.add(new ServiceClassParam(serviceInterfaces.getIdlFullPath(),
+ serviceInterfaces.getIdlSearchPath()));
+ }
+ if( 0<serviceInterfaces.getIdlSearchPath().length() &&
+ rtcParam.getIdlPathes().contains(serviceInterfaces.getIdlSearchPath())==false) {
+ rtcParam.getIdlPathes().add(serviceInterfaces.getIdlSearchPath());
+ }
+ }
+ }
+ if(idlDir!=null) {
+ rtcParam.getIdlPathes().addAll(idlDir);
+ }
+ checkRtcServiceClass(rtcParam, IDLPathParams);
+ }
+
/**
* ジェネレートする
*
@@ -108,15 +140,8 @@
* IDLのパースに失敗した場合など
*/
public List<GeneratedResult> generateTemplateCode(
- GeneratorParam generatorParam, List<String> idlDir, boolean validateFlag)
- throws Exception {
+ GeneratorParam generatorParam, List<String> idlDir) throws Exception {
- if( validateFlag ) {
- for( RtcParam rtcParam : generatorParam.getRtcParams() ) {
- validate(rtcParam);
- }
- }
-
List<ServiceClassParam> rtcServiceClasses = new ArrayList<ServiceClassParam>();
//IDL重複チェック用
List<String> IDLPathes = new ArrayList<String>();
@@ -123,59 +148,58 @@
//IDL読み込み用
List<ServiceClassParam> IDLPathParams = new ArrayList<ServiceClassParam>();
List<GeneratedResult> result = new ArrayList<GeneratedResult>();
- for( RtcParam rtcParam : generatorParam.getRtcParams() ) {
- //onImplementedフラグの修正
- for(int index=IRtcBuilderConstants.ACTIVITY_INITIALIZE;index<IRtcBuilderConstants.ACTIVITY_DUMMY;index++) {
- if(rtcParam.getDetailContent(index)!=null && 0<rtcParam.getDetailContent(index).length()) {
- rtcParam.setActionImplemented(index, true);
- }
+
+ RtcParam rtcParam = generatorParam.getRtcParam();
+ //onImplementedフラグの修正
+ for(int index=IRtcBuilderConstants.ACTIVITY_INITIALIZE;index<IRtcBuilderConstants.ACTIVITY_DUMMY;index++) {
+ if(rtcParam.getDetailContent(index)!=null && 0<rtcParam.getDetailContent(index).length()) {
+ rtcParam.setActionImplemented(index, true);
}
- rtcParam.checkAndSetParameter();
- rtcParam.getIdlPathes().clear();
- for( ServicePortParam serviceport : rtcParam.getServicePorts() ) {
- for( ServicePortInterfaceParam serviceInterfaces : serviceport.getServicePortInterfaces() ) {
- if( !IDLPathes.contains(serviceInterfaces.getIdlFullPath()) ) {
- IDLPathes.add(serviceInterfaces.getIdlFullPath());
- IDLPathParams.add(new ServiceClassParam(serviceInterfaces.getIdlFullPath(),
- serviceInterfaces.getIdlSearchPath()));
- }
- if( 0<serviceInterfaces.getIdlSearchPath().length() &&
- rtcParam.getIdlPathes().contains(serviceInterfaces.getIdlSearchPath())==false) {
- rtcParam.getIdlPathes().add(serviceInterfaces.getIdlSearchPath());
- }
+ }
+ rtcParam.checkAndSetParameter();
+ rtcParam.getIdlPathes().clear();
+ for( ServicePortParam serviceport : rtcParam.getServicePorts() ) {
+ for( ServicePortInterfaceParam serviceInterfaces : serviceport.getServicePortInterfaces() ) {
+ if( !IDLPathes.contains(serviceInterfaces.getIdlFullPath()) ) {
+ IDLPathes.add(serviceInterfaces.getIdlFullPath());
+ IDLPathParams.add(new ServiceClassParam(serviceInterfaces.getIdlFullPath(),
+ serviceInterfaces.getIdlSearchPath()));
}
- }
- if(idlDir!=null) {
- rtcParam.getIdlPathes().addAll(idlDir);
- }
-
- rtcServiceClasses.addAll(getRtcServiceClass(rtcParam, IDLPathParams));
- checkReferencedServiceParam(rtcServiceClasses, rtcParam);
- List<ServiceClassParam> serviceClassParamList = new ArrayList<ServiceClassParam>();
- List<String> serviceClassNameList = new ArrayList<String>();
- for( ServiceClassParam serviceClassParam : rtcServiceClasses ) {
- if( !serviceClassNameList.contains(serviceClassParam.getName()) ) {
- serviceClassNameList.add(serviceClassParam.getName());
- serviceClassParamList.add(serviceClassParam);
+ if( 0<serviceInterfaces.getIdlSearchPath().length() &&
+ rtcParam.getIdlPathes().contains(serviceInterfaces.getIdlSearchPath())==false) {
+ rtcParam.getIdlPathes().add(serviceInterfaces.getIdlSearchPath());
}
}
- rtcParam.getServiceClassParams().clear();
-
- for( ServiceClassParam param : serviceClassParamList ) {
- param.setParent(rtcParam);
- rtcParam.getServiceClassParams().add(param);
+ }
+ if(idlDir!=null) {
+ rtcParam.getIdlPathes().addAll(idlDir);
+ }
+
+ rtcServiceClasses.addAll(getRtcServiceClass(rtcParam, IDLPathParams));
+ checkReferencedServiceParam(rtcServiceClasses, rtcParam);
+
+ List<ServiceClassParam> serviceClassParamList = new ArrayList<ServiceClassParam>();
+ List<String> serviceClassNameList = new ArrayList<String>();
+ for( ServiceClassParam serviceClassParam : rtcServiceClasses ) {
+ if( !serviceClassNameList.contains(serviceClassParam.getName()) ) {
+ serviceClassNameList.add(serviceClassParam.getName());
+ serviceClassParamList.add(serviceClassParam);
}
- List<GeneratedResult> resultEach = new ArrayList<GeneratedResult>();
- for (String key : generateManagerList.keySet()) {
- GenerateManager manager = generateManagerList.get(key);
- if (!"Common".equals(manager.getManagerKey())
- && !rtcParam.getLangList().contains(
- manager.getManagerKey())) {
- continue;
- }
- resultEach.addAll(manager.generateTemplateCode(rtcParam));
+ }
+ rtcParam.getServiceClassParams().clear();
+
+ for( ServiceClassParam param : serviceClassParamList ) {
+ param.setParent(rtcParam);
+ rtcParam.getServiceClassParams().add(param);
+ }
+ for (String key : generateManagerList.keySet()) {
+ GenerateManager manager = generateManagerList.get(key);
+ if (!"Common".equals(manager.getManagerKey())
+ && !rtcParam.getLangList().contains(
+ manager.getManagerKey())) {
+ continue;
}
- result.addAll(resultEach);
+ result.addAll(manager.generateTemplateCode(rtcParam));
}
return result;
@@ -186,7 +210,7 @@
*
* @param generatorParam
*/
- private void validate(RtcParam rtcParam) {
+ public void validate(RtcParam rtcParam) {
if( rtcParam.getOutputProject() == null ) {
throw new RuntimeException(IRTCBMessageConstants.VALIDATE_ERROR_OUTPUTPROJECT);
@@ -289,7 +313,7 @@
* @throws ParseException
*/
private List<ServiceClassParam> getRtcServiceClass(RtcParam rtcParam,
- List<ServiceClassParam> IDLPathes) throws ParseException {
+ List<ServiceClassParam> IDLPathes) throws ParseException, HeaderException {
List<ServiceClassParam> result = new ArrayList<ServiceClassParam>();
List<String> includeFiles = new ArrayList<String>();
@@ -323,7 +347,7 @@
}
String idlContent = FileUtil.readFile(fileName);
if (idlContent == null) continue;
- idl = PreProcessor.parse(idlContent, getIncludeIDLDic(sv.getIdlPath()), incs);
+ idl = PreProcessor.parse(idlContent, getIncludeIDLDic(sv.getIdlPath()), incs, false);
} catch (IOException e) {
continue;
}
@@ -332,6 +356,9 @@
specification spec = parser.specification();
List<ServiceClassParam> serviceClassParams = IDLParamConverter.convert(spec, sv.getName());
+ if(IDLParamConverter.checkSuperInterface(serviceClassParams)==false) {
+ warningMessage = "No parent interface definition found. Please check the IDL and included IDL files. ";
+ }
List<TypeDefParam> typedefParams = IDLParamConverter.convert_typedef(spec, sv.getName());
if (typedefParams.size() > 0) {
serviceClassParams = convertType(serviceClassParams, typedefParams);
@@ -376,6 +403,43 @@
return result;
}
+ private void checkRtcServiceClass(RtcParam rtcParam, List<ServiceClassParam> IDLPathes) throws Exception {
+ for (int intIdx = 0; intIdx < IDLPathes.size(); intIdx++) {
+ ServiceClassParam sv = IDLPathes.get(intIdx);
+ if (sv == null) continue;
+ List<String> incs = new ArrayList<String>();
+ try {
+ String fileName = sv.getName();
+ File file = new File(fileName);
+ if(file.exists()==false) {
+ for(String path : rtcParam.getIdlPathes()) {
+ String fullName = path + File.separator + fileName;
+ file = new File(fullName);
+ if(file.exists()) {
+ for( IdlFileParam idlFile : rtcParam.getProviderIdlPathes() ) {
+ if( idlFile.getIdlFile().equals(fileName) ) {
+ idlFile.setIdlPath(fullName);
+ }
+ }
+ for( IdlFileParam idlFile : rtcParam.getConsumerIdlPathes() ) {
+ if( idlFile.getIdlFile().equals(fileName) ) {
+ idlFile.setIdlPath(fullName);
+ }
+ }
+ fileName = fullName;
+ break;
+ }
+ }
+ }
+ String idlContent = FileUtil.readFile(fileName);
+ if (idlContent == null) continue;
+ PreProcessor.parse(idlContent, getIncludeIDLDic(sv.getIdlPath()), incs, true);
+ } catch (IOException e) {
+ continue;
+ }
+ }
+ }
+
private List<ServiceClassParam> convertType(List<ServiceClassParam> source, List<TypeDefParam> types) {
for(int idxParent=0;idxParent<types.size();idxParent++) {
@@ -676,11 +740,11 @@
*/
public void doGenerateWrite(GeneratorParam generatorParam, List<String> idlDirs,
MergeHandler handler) throws Exception {
-
- for( RtcParam rtcParam : generatorParam.getRtcParams() ) {
- List<GeneratedResult> generatedResult = generateTemplateCode(generatorParam, idlDirs, true);
- writeFile(generatedResult, rtcParam, handler);
- }
+ warningMessage = "";
+ RtcParam rtcParam = generatorParam.getRtcParam();
+ validate(rtcParam);
+ List<GeneratedResult> generatedResult = generateTemplateCode(generatorParam, idlDirs);
+ writeFile(generatedResult, rtcParam, handler);
}
/**
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/GuiRtcBuilder.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/GuiRtcBuilder.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/GuiRtcBuilder.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -4,12 +4,16 @@
import jp.go.aist.rtm.rtcbuilder.Generator.MergeHandler;
import jp.go.aist.rtm.rtcbuilder.generator.GeneratedResult;
+import jp.go.aist.rtm.rtcbuilder.generator.HeaderException;
import jp.go.aist.rtm.rtcbuilder.generator.param.GeneratorParam;
import jp.go.aist.rtm.rtcbuilder.generator.parser.MergeBlockParser;
import jp.go.aist.rtm.rtcbuilder.manager.GenerateManager;
import jp.go.aist.rtm.rtcbuilder.ui.compare.CompareResultDialog;
import jp.go.aist.rtm.rtcbuilder.ui.compare.CompareTarget;
+import jp.go.aist.rtm.rtcbuilder.ui.editors.IMessageConstants;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
@@ -20,6 +24,8 @@
* GUIのRtcBuilderを実行する際のメインとなるクラス
*/
public class GuiRtcBuilder {
+ private final int RETURN_YES = 0;
+ private final int RETURN_NO = 1;
Generator generator = new Generator();
/**
@@ -55,6 +61,19 @@
public boolean doGenerateWrite(GeneratorParam generatorParam, List<String> idlDirs, boolean isShowDialog) {
try {
+ //設定されたパラメータのチェック
+ generator.validate(generatorParam.getRtcParam());
+ //IDLファイルのチェック
+ try {
+ generator.validateIDLDef(generatorParam, idlDirs);
+ } catch (HeaderException ex1) {
+ String[] buttons = new String[] { IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL };
+ MessageDialog dialog = new MessageDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell(),
+ "IDL Error", null, "Warning: Included IDL [" + ex1.getMessage() + "] not found. Generated code might be incomplete. Continue?",
+ MessageDialog.QUESTION, buttons, 0);
+ if(dialog.open() == RETURN_NO) return false;
+ }
+ //
generator.doGenerateWrite(generatorParam, idlDirs, new MergeHandler() {
public int getSelectedProcess(GeneratedResult generatedResult,
String originalFileContents) {
@@ -64,9 +83,15 @@
});
if( isShowDialog ) {
- MessageDialog.openInformation(PlatformUI.getWorkbench()
- .getDisplay().getActiveShell(), "Information",
- "Generate success.");
+ if(0<generator.getWarningMessage().length()) {
+ MessageDialog.openWarning(PlatformUI.getWorkbench()
+ .getDisplay().getActiveShell(), "Warning",
+ generator.getWarningMessage());
+ } else {
+ MessageDialog.openInformation(PlatformUI.getWorkbench()
+ .getDisplay().getActiveShell(), "Information",
+ "Generate success.");
+ }
}
return true;
} catch (Exception e) {
Added: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/HeaderException.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/HeaderException.java (rev 0)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/HeaderException.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -0,0 +1,7 @@
+package jp.go.aist.rtm.rtcbuilder.generator;
+
+public class HeaderException extends Exception {
+ public HeaderException(String message) {
+ super(message);
+ }
+}
Property changes on: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/HeaderException.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/IDLParamConverter.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -117,20 +117,25 @@
return result;
}
- public static void checkSuperInterface(List<ServiceClassParam> targetList) {
+ public static boolean checkSuperInterface(List<ServiceClassParam> targetList) {
for(ServiceClassParam target : targetList) {
if( target.getSuperInterfaceList().size()==0 ) continue;
+ boolean isHit = false;
for(String targetIF : target.getSuperInterfaceList()) {
for(ServiceClassParam source : targetList) {
if(targetIF.equals(source.getName())) {
target.getMethods().addAll(source.getMethods());
target.setTypeDef(source.getTypeDefList());
+ isHit = true;
break;
}
}
+ if(isHit==false) {
+ return false;
+ }
}
}
-
+ return true;
}
/**
@@ -202,7 +207,7 @@
public void visit(enum_type n, String argu) {
final TypeDefParam tdparam = new TypeDefParam();
tdparam.setModuleName(getModuleNames());
- tdparam.setEnum(true);
+// tdparam.setEnum(true);
n.identifier.accept(new DepthFirstVisitor(){
@Override
public void visit(identifier n) {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/PreProcessor.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -78,7 +78,7 @@
* @return 実行後文字列
* @throws IOException
*/
- public static String parse(String target, File includeBaseDir, List<String> includeFiles) throws IOException {
+ public static String parse(String target, File includeBaseDir, List<String> includeFiles, boolean isCheck) throws IOException, HeaderException {
String targetNoCmt = eraseComments(target);
/////
StringBuffer result = new StringBuffer();
@@ -86,7 +86,7 @@
while (matcher.find()) {
String replateString = "";
String includeFileContent = getIncludeFileContentThoroughgoing(
- matcher.group(), includeBaseDir, includeFiles);
+ matcher.group(), includeBaseDir, includeFiles, isCheck);
if (includeFileContent != null) {
replateString = includeFileContent;
}
@@ -100,10 +100,10 @@
}
public static String getIncludeFileContentThoroughgoing(String directive,
- File includeBaseDir, List<String> includeFiles) throws IOException {
- String result = getIncludeFileContent(directive, includeBaseDir, includeFiles);
+ File includeBaseDir, List<String> includeFiles, boolean isCheck) throws IOException, HeaderException {
+ String result = getIncludeFileContent(directive, includeBaseDir, includeFiles, isCheck);
if (result != null) {
- result = parse(result, includeBaseDir, includeFiles);
+ result = parse(result, includeBaseDir, includeFiles, isCheck);
}
return result;
@@ -118,7 +118,7 @@
* @throws IOException
*/
public static String getIncludeFileContent(String directive,
- File includeBaseDir, List<String> includeFiles) throws IOException {
+ File includeBaseDir, List<String> includeFiles, boolean isCheck) throws IOException, HeaderException {
String result = null;
Matcher matcher = INCLUDE_PATTERN.matcher(directive);
@@ -130,12 +130,13 @@
String includeFilePath = new File(includeBaseDir, filePath).getAbsolutePath();
File target = new File(includeFilePath);
if(target.exists()==false) {
- throw new RuntimeException("Include of IDL '" + filePath + "' cannot be solved");
- }
- result = FileUtil.readFile(includeFilePath);
- if(includeFiles!=null) {
- if( !includeFiles.contains(includeFilePath) ) {
- includeFiles.add(includeFilePath);
+ if(isCheck) throw new HeaderException(filePath);
+ } else {
+ result = FileUtil.readFile(includeFilePath);
+ if(includeFiles!=null) {
+ if( !includeFiles.contains(includeFilePath) ) {
+ includeFiles.add(includeFilePath);
+ }
}
}
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/ProfileHandler.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -82,7 +82,7 @@
ParamUtil putil = new ParamUtil();
RtcParam rtcParam = putil.convertFromModule(profile, generatorParam, managerList, isDirect);
rtcParam.setRtcXml(tmp_sb.toString());
- generatorParam.getRtcParams().add(rtcParam);
+ generatorParam.setRtcParam(rtcParam);
} catch (FileNotFoundException e) {
throw new Exception(IRTCBMessageConstants.ERROR_PROFILE_RESTORE, e);
} catch (IOException e) {
@@ -173,7 +173,7 @@
GeneratorParam generatorParam = new GeneratorParam();
ParamUtil util = new ParamUtil();
RtcParam rtcParam = util.convertFromModule(profile, generatorParam, managerList);
- generatorParam.getRtcParams().add(rtcParam);
+ generatorParam.setRtcParam(rtcParam);
return generatorParam;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/GeneratorParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/GeneratorParam.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/GeneratorParam.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -12,13 +12,17 @@
private static final long serialVersionUID = -935608504783590375L;
- List<RtcParam> rtcParams = new ArrayList<RtcParam>();
+ RtcParam rtcParam;
List<DataTypeParam> dataTypeParams = new ArrayList<DataTypeParam>();
- public List<RtcParam> getRtcParams() {
- return rtcParams;
+ public RtcParam getRtcParam() {
+ return rtcParam;
}
+ public void setRtcParam(RtcParam rtcParam) {
+ this.rtcParam = rtcParam;
+ }
+
public List<DataTypeParam> getDataTypeParams() {
return dataTypeParams;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/ParamUtil.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -557,7 +557,7 @@
public RtcProfile convertToModule(GeneratorParam generatorParam,
List<GenerateManager> managerList) throws Exception {
- RtcParam rtcParam = generatorParam.getRtcParams().get(0);
+ RtcParam rtcParam = generatorParam.getRtcParam();
return convertToModule(rtcParam, managerList);
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/generator/param/idl/TypeDefParam.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -17,11 +17,7 @@
private boolean isSequence;
private boolean isString;
private boolean isArray;
- private boolean isInnerArray;
private boolean isStruct;
- private boolean isEnum;
- private boolean isChildString;
- private boolean isChildDouble;
private boolean isUnbounded;
private boolean isInterface;
@@ -39,11 +35,7 @@
isSequence = false;
isString = false;
isArray = false;
- isInnerArray = false;
isStruct = false;
- isEnum = false;
- isChildString = false;
- isChildDouble = false;
isUnbounded = false;
isInterface = false;
@@ -102,13 +94,6 @@
this.isArray = isArray;
}
- public boolean isInnerArray() {
- return isInnerArray;
- }
- public void setInnerArray(boolean isInnerArray) {
- this.isInnerArray = isInnerArray;
- }
-
public boolean isStruct() {
return isStruct;
}
@@ -116,27 +101,6 @@
this.isStruct = isStruct;
}
- public boolean isEnum() {
- return isEnum;
- }
- public void setEnum(boolean isEnum) {
- this.isEnum = isEnum;
- }
-
- public boolean isChildString() {
- return isChildString;
- }
- public void setChildString(boolean isChildString) {
- this.isChildString = isChildString;
- }
-
- public boolean isChildDouble() {
- return isChildDouble;
- }
- public void setChildDouble(boolean isChildDouble) {
- this.isChildDouble = isChildDouble;
- }
-
public List<String> getChildType() {
return childType;
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/BasicEditorFormPage.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -149,23 +149,22 @@
private void switchPerspective() {
- for(RtcParam rtcParam : editor.getGeneratorParam().getRtcParams() ) {
- //Pluginの存在確認
- LanguageProperty langProp = LanguageProperty.checkPlugin(rtcParam);
- String currentPerspectiveId = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage().getPerspective().getId();
- if( langProp != null && !langProp.getPerspectiveId().equals(currentPerspectiveId) ) {
- MessageBox message = new MessageBox(getSite().getShell(),
- SWT.ICON_QUESTION | SWT.YES | SWT.NO);
- message.setText(IMessageConstants.BASIC_PERSPECTIVE_TEXT);
- message.setMessage(IMessageConstants.BASIC_PERSPECTIVE_MSG1 + langProp.getPerspectiveName()
- + IMessageConstants.BASIC_PERSPECTIVE_MSG2);
- if( message.open() == SWT.YES) {
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective(
- PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(
- langProp.getPerspectiveId()));
- }
- }
+ RtcParam rtcParam = editor.getGeneratorParam().getRtcParam();
+ //Pluginの存在確認
+ LanguageProperty langProp = LanguageProperty.checkPlugin(rtcParam);
+ String currentPerspectiveId = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage().getPerspective().getId();
+ if( langProp != null && !langProp.getPerspectiveId().equals(currentPerspectiveId) ) {
+ MessageBox message = new MessageBox(getSite().getShell(),
+ SWT.ICON_QUESTION | SWT.YES | SWT.NO);
+ message.setText(IMessageConstants.BASIC_PERSPECTIVE_TEXT);
+ message.setMessage(IMessageConstants.BASIC_PERSPECTIVE_MSG1 + langProp.getPerspectiveName()
+ + IMessageConstants.BASIC_PERSPECTIVE_MSG2);
+ if( message.open() == SWT.YES) {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().setPerspective(
+ PlatformUI.getWorkbench().getPerspectiveRegistry().findPerspectiveWithId(
+ langProp.getPerspectiveId()));
+ }
}
}
@@ -339,8 +338,8 @@
}
GeneratorParam generatorParam = editor.getGeneratorParam();
//TODO 複数コンポーネント対応版とする場合には複数設定
- generatorParam.getRtcParams().get(0).getServiceClassParams().clear();
- setPrefixSuffix(generatorParam.getRtcParams().get(0));
+ generatorParam.getRtcParam().getServiceClassParams().clear();
+ setPrefixSuffix(generatorParam.getRtcParam());
List<String> idlDirs = getIDLDirectoriesForData();
if (rtcBuilder.doGenerateWrite(generatorParam, idlDirs, true)) {
LanguageProperty langProp = LanguageProperty.checkPlugin(editor.getRtcParam());
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/RtcBuilderEditor.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -126,10 +126,10 @@
String[] target = ((FileEditorInput) result).getPath().segments();
if( target.length>1 ) {
title = target[target.length-2];
- generatorParam.getRtcParams().get(0).setOutputProject(title);
+ generatorParam.getRtcParam().setOutputProject(title);
} else {
title = ((FileEditorInput) result).getPath().lastSegment();
- generatorParam.getRtcParams().get(0).setOutputProject(title);
+ generatorParam.getRtcParam().setOutputProject(title);
}
//on_initializeは常にON
setOnInitialize();
@@ -146,13 +146,12 @@
}
private void setOnInitialize() {
- for( RtcParam param : generatorParam.getRtcParams() ) {
- param.setActionImplemented(IRtcBuilderConstants.ACTIVITY_INITIALIZE, true);
- }
+ RtcParam param = generatorParam.getRtcParam();
+ param.setActionImplemented(IRtcBuilderConstants.ACTIVITY_INITIALIZE, true);
}
public void loadNewData(RtcParam param) {
- this.generatorParam.getRtcParams().set(0, param);
+ this.generatorParam.setRtcParam(param);
title = "RtcBuilder";
if( buildview==null ) buildview = ComponentFactory.eINSTANCE.createBuildView();
@@ -194,7 +193,7 @@
rtcParam.setDocCreator(DocumentPreferenceManager.getCreatorValue());
//
rtcParam.resetUpdated();
- generatorParam.getRtcParams().add(rtcParam);
+ generatorParam.setRtcParam(rtcParam);
buildview = ComponentFactory.eINSTANCE.createBuildView();
}
@@ -457,9 +456,7 @@
} else {
DatatypeFactory dateFactory = new DatatypeFactoryImpl();
String dateTime = dateFactory.newXMLGregorianCalendar(new GregorianCalendar()).toString();
- for(RtcParam rtcParam : generatorParam.getRtcParams() ) {
- rtcParam.setUpdateDate(dateTime);
- }
+ generatorParam.getRtcParam().setUpdateDate(dateTime);
ProfileHandler handler = new ProfileHandler();
xmlFile = handler.convert2XML(generatorParam);
}
@@ -508,8 +505,7 @@
ProfileHandler handler = new ProfileHandler();
RtcProfile module = handler.restorefromXML(xmlFile);
ParamUtil putil = new ParamUtil();
- getGeneratorParam().getRtcParams().set(0,
- putil.convertFromModule(module, generatorParam, managerList));
+ getGeneratorParam().setRtcParam(putil.convertFromModule(module, generatorParam, managerList));
getRtcParam().setRtcXml(xmlFile);
//
if (basicFormPage != null) basicFormPage.load();
@@ -582,7 +578,7 @@
* RtcParamを取得する
*/
public RtcParam getRtcParam() {
- return generatorParam.getRtcParams().get(0);
+ return generatorParam.getRtcParam();
}
/**
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ServicePortEditorFormPage.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ServicePortEditorFormPage.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/ui/editors/ServicePortEditorFormPage.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -281,8 +281,8 @@
*/
public void load() {
GeneratorParam generator = editor.getGeneratorParam();
- if( generator.getRtcParams().size() > 0 ) {
- RtcParam rtcParam = generator.getRtcParams().get(0);
+ if( generator.getRtcParam()!=null) {
+ RtcParam rtcParam = generator.getRtcParam();
if( servicePortViewer != null )
servicePortViewer.setInput(rtcParam.getServicePorts());
editor.updateEMFDataPorts(
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBaseClass.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -30,7 +30,7 @@
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testDFFSMMM() throws Exception{
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBasicTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -26,7 +26,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testOperation() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXBuildTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -31,7 +31,7 @@
rtcParam.setLanguageArg(LANG_CPP_ARG);
rtcParam.setRtmVersion(RTM_VERSION_100);
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
generator = new Generator();
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConfigSetTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -32,7 +32,7 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testConfigSet() throws Exception{
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXConstraint.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -32,7 +32,7 @@
rtcParam.setMaxInstance(3);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testConstraint3() throws Exception{
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXContentTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -22,7 +22,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testBasic() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDataPortIDLTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -24,7 +24,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testOutPortIDL() throws Exception{
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXDocLongTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -28,7 +28,7 @@
rtcParam.setLanguageArg(LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testDocAllLong() throws Exception{
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXExCxtTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -24,7 +24,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testExecutionContext() throws Exception{
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLInheritTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -38,7 +38,7 @@
rtcParam.setMaxInstance(2);
rtcParam.setRtmVersion(IRtcBuilderConstants.RTM_VERSION_100);
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
generator = new Generator();
}
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLModuleTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -25,7 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testProvModule() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLPathTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -26,7 +26,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testIDLSearchPath3() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLStructTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -25,7 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testIDLStruct() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXIDLType.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -49,7 +49,7 @@
srvports.add(service1);
rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
@@ -85,7 +85,7 @@
srvports.add(service1);
rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
@@ -120,7 +120,7 @@
List<ServicePortParam> srvports = new ArrayList<ServicePortParam>();
srvports.add(service1);
rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
@@ -156,7 +156,7 @@
srvports.add(service1);
rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
@@ -193,7 +193,7 @@
srvports.add(service1);
rtcParam.getServicePorts().addAll(srvports);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
Generator generator = new Generator();
List<GeneratedResult> result = generator.generateTemplateCode(genParam);
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXImplTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -22,7 +22,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testAll() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLibraryTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -23,7 +23,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testLibrary2() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLuckTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLuckTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXLuckTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -25,7 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testConsumerNoType() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXManipTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -25,7 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testArgStructModule() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXMultiTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -36,7 +36,7 @@
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
List<DataPortParam> dataInport = new ArrayList<DataPortParam>();
dataInport.add(new DataPortParam("in1", "TimedShort", "", 0));
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXPrefixSuffixTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -36,7 +36,7 @@
rtcParam.setComponentKind("DataFlowComponent");
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
//
List<DataPortParam> dataport = new ArrayList<DataPortParam>();
dataport.add(new DataPortParam("InP1", "RTC::TimedShort", "", 0));
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXSystemConfigTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -25,7 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testSystemConfig() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXTemplateTestAIST2.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -25,7 +25,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testAIST5() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/_100/CXXVariableTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -26,7 +26,7 @@
rtcParam.setLanguageArg(IRtcBuilderConstants.LANG_CPP_ARG);
rtcParam.setRtmVersion("1.0.0");
rtcParam.setIsTest(true);
- genParam.getRtcParams().add(rtcParam);
+ genParam.setRtcParam(rtcParam);
}
public void testServicePort2() throws Exception {
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseCommentTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -16,7 +16,7 @@
public void testMultiComment() throws Exception{
String idlContent = FileUtil.readFile(rootPath + "\\resource\\IDL\\WalkGeneratorService.idl");
- String idl = PreProcessor.parse(idlContent, null, null);
+ String idl = PreProcessor.parse(idlContent, null, null, true);
IDLParser parser = new IDLParser(new StringReader(idl));
specification spec = parser.specification();
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/com/CORBAParseInheritTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -20,7 +20,7 @@
List<String> includeFiles = new ArrayList<String>();
String idlContent = FileUtil.readFile(rootPath + "\\resource\\IDL\\MyServiceChild.idl");
- String idl = PreProcessor.parse(idlContent, getIncludeIDLDic(rootPath + "\\resource\\IDL"), includeFiles);
+ String idl = PreProcessor.parse(idlContent, getIncludeIDLDic(rootPath + "\\resource\\IDL"), includeFiles, true);
IDLParser parser = new IDLParser(new StringReader(idl));
specification spec = parser.specification();
@@ -45,7 +45,7 @@
List<String> includeFiles = new ArrayList<String>();
String idlContent = FileUtil.readFile(rootPath + "\\resource\\IDL\\MyServiceChildWithType.idl");
- String idl = PreProcessor.parse(idlContent, getIncludeIDLDic(rootPath + "\\resource\\IDL"), includeFiles);
+ String idl = PreProcessor.parse(idlContent, getIncludeIDLDic(rootPath + "\\resource\\IDL"), includeFiles, true);
IDLParser parser = new IDLParser(new StringReader(idl));
specification spec = parser.specification();
@@ -69,7 +69,7 @@
List<String> includeFiles = new ArrayList<String>();
String idlContent = FileUtil.readFile(rootPath + "\\resource\\IDL\\MyServiceChildMulti.idl");
- String idl = PreProcessor.parse(idlContent, getIncludeIDLDic(rootPath + "\\resource\\IDL"), includeFiles);
+ String idl = PreProcessor.parse(idlContent, getIncludeIDLDic(rootPath + "\\resource\\IDL"), includeFiles, true);
IDLParser parser = new IDLParser(new StringReader(idl));
specification spec = parser.specification();
Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/cxx/PreProcessorTest.java
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/cxx/PreProcessorTest.java 2017-10-15 13:21:39 UTC (rev 772)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder/test/jp/go/aist/rtm/rtcbuilder/_test/cxx/PreProcessorTest.java 2017-10-15 13:22:26 UTC (rev 773)
@@ -14,11 +14,11 @@
public void testIsInclude() throws Exception {
String result;
- result = PreProcessor.getIncludeFileContent("#include <test.txt>", new File(rootPath + "\\resource"), null);
+ result = PreProcessor.getIncludeFileContent("#include <test.txt>", new File(rootPath + "\\resource"), null, true);
assertEquals("testTextContents\r\n", result);
result = PreProcessor.getIncludeFileContent("#include \"test.txt\"",
- new File(rootPath + "\\resource"), null);
+ new File(rootPath + "\\resource"), null, true);
assertEquals("testTextContents\r\n", result);
}
@@ -26,17 +26,17 @@
public void testDefault() throws Exception {
String result;
- result = PreProcessor.parse("", null, null);
+ result = PreProcessor.parse("", null, null, true);
assertEquals("", result);
result = PreProcessor.parse(
"\n#IFDEF \n#IFDEF HOGE_TYPE \nhoge\n// #comment#\n#ENDIF",
- null, null);
+ null, null, true);
assertEquals("\n\n\nhoge\n// #comment#\n", result);
result = PreProcessor.parse(
"\n#IFDEF \n#IFDEF HOGE_TYPE \nhoge\n// #comment#\n#ENDIF",
- null, null);
+ null, null, true);
assertEquals("\n\n\nhoge\n// #comment#\n", result);
}
More information about the openrtm-commit
mailing list