You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2012/06/17 22:16:00 UTC
svn commit: r1351151 - in /ant/sandbox/antdsl: org.apache.ant.antdsl/src/org/apache/ant/antdsl/ org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/ test/

Author: hibou
Date: Sun Jun 17 20:16:00 2012
New Revision: 1351151

URL: http://svn.apache.org/viewvc?rev=1351151&view=rev
Log:
Add documentation to macro

Modified:
    ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/AntDSL.g
    ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDSL.xtext
    ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java
    ant/sandbox/antdsl/test/build.ant

Modified: ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/AntDSL.g
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/AntDSL.g?rev=1351151&r1=1351150&r2=1351151&view=diff
==============================================================================
--- ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/AntDSL.g (original)
+++ ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/AntDSL.g Sun Jun 17 20:16:00 2012
@@ -141,6 +141,7 @@ conditionedTasks returns [ConditionnalSe
     ;
 
 macrodef returns [MacroDef macroDef = new MacroDef()]:
+    ( DOC { macroDef.setDescription($DOC.text); } )?  
     'macrodef' NAME { macroDef.setName($NAME.text); }
     '(' ( atts=attributes
           {  for (Object att : atts) {

Modified: ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDSL.xtext
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDSL.xtext?rev=1351151&r1=1351150&r2=1351151&view=diff
==============================================================================
--- ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDSL.xtext (original)
+++ ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDSL.xtext Sun Jun 17 20:16:00 2012
@@ -57,7 +57,7 @@ EConditionedTasks:
     'if' '(' condition=EInnerElement ')' tasks=ETaskLists;
 
 EMacrodef:
-    'macrodef' name=NAME '(' attributes=EAttributes? ')' tasks=ETaskLists;
+    description=DOC? 'macrodef' name=NAME '(' attributes=EAttributes? ')' tasks=ETaskLists;
 
 EAttributes:
     attributes+=EAttribute (',' attributes+=EAttribute)*;

Modified: ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java?rev=1351151&r1=1351150&r2=1351151&view=diff
==============================================================================
--- ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java (original)
+++ ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java Sun Jun 17 20:16:00 2012
@@ -117,6 +117,7 @@ public class AntDslXTextProjectHelper ex
 
     private void mapMacro(Project project, AntDslContext context, EMacrodef emacro) {
         MacroDef macroDef = new MacroDef();
+        macroDef.setDescription(emacro.getDescription());
         macroDef.setName(emacro.getName());
         EAttributes eatts = emacro.getAttributes();
         if (eatts != null) {

Modified: ant/sandbox/antdsl/test/build.ant
URL: http://svn.apache.org/viewvc/ant/sandbox/antdsl/test/build.ant?rev=1351151&r1=1351150&r2=1351151&view=diff
==============================================================================
--- ant/sandbox/antdsl/test/build.ant (original)
+++ ant/sandbox/antdsl/test/build.ant Sun Jun 17 20:16:00 2012
@@ -6,6 +6,7 @@ default : build
 	echo(message="${foo}")
 }
 
+% Some documentation of the macro
 macrodef mymacro(arg t = "mymacro") {
 	echo(message = "@{t}")
 }