Permalink
Browse files

Support for ENUM (#189)

  • Loading branch information...
gquerret committed Apr 27, 2017
1 parent e39e917 commit 2322fae0d633fe3b6351f402817dc14179295d9e
Showing with 1,657 additions and 376 deletions.
  1. +1 −2 .classpath
  2. +3 −3 Jenkinsfile
  3. +6 −2 PCT TestNG.launch
  4. +3 −9 build.xml
  5. BIN lib/ast-dependencies.jar
  6. BIN lib/ast.jar
  7. BIN lib/oe_common_services.jar
  8. BIN lib/parser.jar
  9. +1 −1 sonar.xml
  10. +173 −22 src/java/eu/rssw/pct/oedoc/ClassDocumentationVisitor.java
  11. +0 −190 src/java/eu/rssw/pct/oedoc/OpenEdgeDocumentation.java
  12. +3 −2 src/java/eu/rssw/pct/oedoc/OpenEdgeDocumentation115.java
  13. +2 −1 src/java/eu/rssw/pct/oedoc/OpenEdgeHTMLDocumentation.java
  14. +2 −1 src/java/eu/rssw/pct/oedoc/OpenEdgeXMLDocumentation.java
  15. +14 −11 src/java/eu/rssw/pct/oedoc/ProcedureDocumentationVisitor.java
  16. +36 −0 src/java/eu/rssw/rcode/AccessModifier.java
  17. +87 −0 src/java/eu/rssw/rcode/ClassCompilationUnit.java
  18. +36 −0 src/java/eu/rssw/rcode/Constructor.java
  19. +67 −0 src/java/eu/rssw/rcode/Dataset.java
  20. +38 −0 src/java/eu/rssw/rcode/EnumMember.java
  21. +46 −0 src/java/eu/rssw/rcode/Event.java
  22. +37 −0 src/java/eu/rssw/rcode/Function.java
  23. +34 −0 src/java/eu/rssw/rcode/GetSetModifier.java
  24. +64 −0 src/java/eu/rssw/rcode/Method.java
  25. +36 −0 src/java/eu/rssw/rcode/Parameter.java
  26. +38 −0 src/java/eu/rssw/rcode/ParameterMode.java
  27. +37 −0 src/java/eu/rssw/rcode/Procedure.java
  28. +53 −0 src/java/eu/rssw/rcode/ProcedureCompilationUnit.java
  29. +38 −0 src/java/eu/rssw/rcode/Property.java
  30. +30 −0 src/java/eu/rssw/rcode/TableField.java
  31. +39 −0 src/java/eu/rssw/rcode/TableIndex.java
  32. +94 −0 src/java/eu/rssw/rcode/TempTable.java
  33. +28 −0 src/java/eu/rssw/rcode/Using.java
  34. +24 −0 src/java/eu/rssw/rcode/UsingType.java
  35. +5 −1 src/java/eu/rssw/{pct/oedoc → rcode}/jaxb.index
  36. +0 −3 src/java/extras.properties
  37. +1 −1 src/progress/Consultingwerk/Framework/Base/AblPrimitiveList.cls
  38. +172 −102 src/progress/Consultingwerk/Studio/ClassDocumentation/ClassDocumentationParser.cls
  39. +8 −5 src/progress/Consultingwerk/Studio/ClassDocumentation/dsClassDocumentation.i
  40. +41 −0 src/progress/Consultingwerk/Studio/ClassDocumentation/eDataset.i
  41. +40 −0 src/progress/Consultingwerk/Studio/ClassDocumentation/eEnumMember.i
  42. +2 −2 src/progress/Consultingwerk/Studio/ClassDocumentation/eEvent.i
  43. +40 −0 src/progress/Consultingwerk/Studio/ClassDocumentation/eMember.i
  44. +3 −3 src/progress/Consultingwerk/Studio/ClassDocumentation/eMethod.i
  45. +2 −2 src/progress/Consultingwerk/Studio/ClassDocumentation/eProperty.i
  46. +44 −0 src/progress/Consultingwerk/Studio/ClassDocumentation/eTempTable.i
  47. +5 −0 src/progress/Consultingwerk/Studio/ClassDocumentation/eTreeNode.i
  48. +12 −9 src/progress/Consultingwerk/Studio/ClassDocumentation/eUnit.i
  49. +72 −0 src/progress/Consultingwerk/Util/ListHelper.cls
  50. +35 −0 src/test/com/phenix/pct/ClassDocumentationTest.java
  51. +4 −0 tests/ClassDocumentation/test1/src/eu/rssw/pct/A.cls
  52. +3 −3 tests/ClassDocumentation/test1/src/eu/rssw/pct/C.cls
  53. +13 −1 tests/ClassDocumentation/test1/src/eu/rssw/pct/X.cls
  54. +8 −0 tests/ClassDocumentation/test1/src/eu/rssw/pct/inc2.i
  55. +4 −0 tests/ClassDocumentation/test1/src/eu/rssw/pct/inc3.i
  56. +13 −0 tests/ClassDocumentation/test6/build.xml
  57. +15 −0 tests/ClassDocumentation/test6/src/rssw/pct/TestClass1.cls
  58. +15 −0 tests/ClassDocumentation/test6/src/rssw/pct/TestClass2.cls
  59. +30 −0 tests/ClassDocumentation/test6/src/rssw/pct/TestClass3.cls
View
@@ -6,8 +6,6 @@
<classpathentry kind="lib" path="lib/ant.jar" sourcepath="lib/ant-src.jar"/>
<classpathentry kind="lib" path="lib/ant-launcher.jar" sourcepath="lib/ant-src.jar"/>
<classpathentry kind="lib" path="lib/testng-6.3.1.jar" sourcepath="lib/testng-src.jar"/>
<classpathentry kind="lib" path="lib/parser.jar"/>
<classpathentry kind="lib" path="lib/oe_common_services.jar"/>
<classpathentry kind="lib" path="lib/jcommander-1.30.jar"/>
<classpathentry kind="lib" path="lib/guava.jar"/>
<classpathentry kind="lib" path="lib/gson-2.2.4.jar"/>
@@ -17,3 +15,4 @@
<classpathentry kind="lib" path="lib/ini4j-0.5.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
@@ -7,7 +7,7 @@ stage('Class documentation build') {
def jdk = tool name: 'JDK 1.8 64b', type: 'hudson.model.JDK'
withEnv(["JAVA_HOME=${jdk}"]) {
bat "${antHome}\\bin\\ant -DDLC=${dlc11} classDoc"
bat "${antHome}\\bin\\ant -DDLC11=${dlc11} classDoc"
}
stash name: 'classdoc', includes: 'dist/classDoc.zip'
}
@@ -31,12 +31,12 @@ stage('Standard build') {
}
stage('Full tests') {
parallel branch1: { testBranch('EC2-EU1B', 'OE-11.6', true, '11.6-Win', 11, 32) },
parallel branch8: { testBranch('EC2-EU1B', 'OE-10.2B', false, '10.2-Win', 10, 32) },
branch1: { testBranch('EC2-EU1B', 'OE-11.6', true, '11.6-Win', 11, 32) },
branch4: { testBranch('master', 'OE-10.2B-64b', false, '10.2-64-Linux', 10, 64) },
branch5: { testBranch('master', 'OE-11.6', false, '11.6-Linux', 11, 64) },
branch6: { testBranch('master', 'OE-11.7', false, '11.7-Linux', 11, 64) },
branch7: { testBranch('master', 'OE-10.2B', false, '10.2-Linux', 10, 32) },
branch8: { testBranch('EC2-EU1B', 'OE-10.2B', false, '10.2-Win', 10, 32) },
failFast: false
node('master') {
// Wildcards not accepted in unstash...
View
@@ -13,20 +13,24 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="PCT"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DDLC=C:/Progress/DLC-11.3 -DTESTLIBS=C:/Users/Bastien/ProjetsRiverside/ProgressLib"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DDLC=C:/Progress/OpenEdge-11.6 -DTESTLIBS=C:/Users/gquer/Projets/PCT/lib"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:PCT/testbox}"/>
<mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS">
<mapEntry key="com.phenix.pct.ABLUnitTest" value=""/>
<mapEntry key="com.phenix.pct.ClassDocumentationTest" value=""/>
<mapEntry key="com.phenix.pct.PCTCompileTest" value=""/>
<mapEntry key="com.phenix.pct.PCTRunTest" value=""/>
<mapEntry key="com.phenix.pct.ProUnitTest" value=""/>
</mapAttribute>
<listAttribute key="org.testng.eclipse.CLASS_TEST_LIST">
<listEntry value="com.phenix.pct.ABLUnitTest"/>
<listEntry value="com.phenix.pct.ClassDocumentationTest"/>
</listAttribute>
<booleanAttribute key="org.testng.eclipse.DEBUG" value="false"/>
<listAttribute key="org.testng.eclipse.GROUP_LIST"/>
<listAttribute key="org.testng.eclipse.GROUP_LIST_CLASS"/>
<stringAttribute key="org.testng.eclipse.LOG_LEVEL" value="2"/>
<listAttribute key="org.testng.eclipse.PACKAGE_TEST_LIST"/>
<stringAttribute key="org.testng.eclipse.PROTOCOL" value="json"/>
<intAttribute key="org.testng.eclipse.TYPE" value="1"/>
<booleanAttribute key="org.testng.eclipse.VERBOSE" value="false"/>
</launchConfiguration>
View
@@ -75,8 +75,6 @@
<!-- Classpath for PCT compilation -->
<path id="pct.compil">
<pathelement location="lib/ant.jar" />
<pathelement location="lib/parser.jar" />
<pathelement location="lib/oe_common_services.jar" />
<pathelement location="lib/jcommander-1.30.jar" />
<pathelement location="lib/gson-2.2.4.jar" />
<pathelement location="lib/profiler-parser-shaded-1.4.1.jar" />
@@ -225,7 +223,7 @@
<target name="classDoc" depends="declare-bootstrap" description="Windows compilation of class documentation">
<mkdir dir="${build-win}" />
<bootstrapCompile destdir="${build-win}" md5="true" minSize="false" graphicalMode="true" dlcHome="${DLC}" includedPL="false" cpstream="iso8859-1" debugListing="true" listing="true" relativePaths="true" requireFullKeywords="true" requireFullNames="true" requireFieldQualifiers="true">
<bootstrapCompile destdir="${build-win}" md5="true" minSize="false" graphicalMode="true" dlcHome="${DLC11}" includedPL="false" cpstream="iso8859-1" debugListing="true" listing="true" relativePaths="true" requireFullKeywords="true" requireFullNames="true" requireFieldQualifiers="true">
<fileset refid="fs.classDoc" />
<propath>
<pathelement location="${src.progress}" />
@@ -273,11 +271,11 @@
<fileset dir="${src.java}">
<include name="eu/rssw/pct/antlib.xml" />
<include name="eu/rssw/pct/oedoc/antlib.xml" />
<include name="eu/rssw/rcode/jaxb.index" />
</fileset>
<zipfileset src="lib/gson-2.2.4.jar" />
<zipfileset src="lib/profiler-parser-shaded-1.4.1.jar" includes="**/*.class" />
<zipfileset dir="${src.progress}/Consultingwerk/Studio/ClassDocumentation/Templates" prefix="templates" />
<zipfileset src="lib/parser.jar" includes="eu/rssw/rcode/*.class,**/jaxb.index" />
<manifest>
<attribute name="Built-By" value="${user.name}" />
<section name="common">
@@ -347,11 +345,7 @@
<target name="dist" depends="srcdist,jar,testdist" />
<target name="clean" description="Nettoyage">
<delete dir="${build-java}" />
<delete dir="${build-test}" />
<delete dir="${build-v10}" />
<delete dir="${build-v10-64}" />
<delete dir="${build-v11}" />
<delete dir="${build}" />
<delete dir="${dist}" />
<delete dir="${doc}" />
<delete>
View
BIN +15.9 KB (100%) lib/ast-dependencies.jar
Binary file not shown.
View
BIN -18.8 KB (99%) lib/ast.jar
Binary file not shown.
View
Binary file not shown.
View
BIN -520 KB lib/parser.jar
Binary file not shown.
View
@@ -4,7 +4,7 @@
<property environment="env" />
<taskdef resource="net/sf/antcontrib/antlib.xml" />
<path id="lib.cp">
<filelist dir="lib" files="ant.jar,ant-launcher.jar,oe_common_services.jar,parser.jar,testng-6.3.1.jar,gson-2.2.4.jar,profiler-parser-shaded-1.4.1.jar" />
<filelist dir="lib" files="ant.jar,ant-launcher.jar,testng-6.3.1.jar,gson-2.2.4.jar,profiler-parser-shaded-1.4.1.jar" />
</path>
<property name="sonar.host.url" value="${SONAR_URL}" />
Oops, something went wrong.

0 comments on commit 2322fae

Please sign in to comment.