youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

Change ${x} to @{x} for attribute notation of macrodef 

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275731 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 21 years ago
parent
2a426f599f
commit
8dd4e0ba76
7 changed files with 129 additions and 47 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      build.xml
  2. +22
    -13
      docs/manual/CoreTasks/macrodef.html
  3. +2
    -2
      docs/manual/CoreTypes/antlib.html
  4. +14
    -4
      src/etc/testcases/taskdefs/macrodef.xml
  5. +44
    -8
      src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  6. +40
    -18
      src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
  7. +5
    -0
      src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java

+ 2
- 2
build.xml View File

@@ -817,10 +817,10 @@
<macrodef name="optional-jar">
<attribute name="dep"/>
<sequential>
<jar destfile="${build.lib}/${optional.jars.prefix}-${dep}.jar"
<jar destfile="${build.lib}/${optional.jars.prefix}-@{dep}.jar"
basedir="${build.classes}"
manifest="${manifest.tmp}">
<selector refid="needs.${dep}"/>
<selector refid="needs.@{dep}"/>
</jar>
</sequential>
</macrodef>


+ 22
- 13
docs/manual/CoreTasks/macrodef.html View File

@@ -3,6 +3,11 @@
<head>
<meta http-equiv="Content-Language" content="en-us"></meta>
<title>MacroDef Task</title>
<style type="text/css">
<!--
.code { background: #EFEFEF; margin-top: }
-->
</style>
</head>
<body>
@@ -49,8 +54,12 @@
</p>
<p>
This attribute is placed in the body of the templated
task using the ant property notation - ${attribute name}.
Note that is not an actual ant property.
task using a notation similar to the ant property notation
- @{attribute name}. (May be remembered as "put the substitution
AT this location").
The escape sequence @@{x} is used to allow @{x} to be
placed in the text without substitution of x.
This corresponds to the $${x} escape sequence for properties
</p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
@@ -107,12 +116,12 @@
runs it.
</p>
<blockquote>
<pre>
<pre class=code>
&lt;macrodef name="testing"&gt;
&lt;attribute name="v" default="NOT SET"/&gt;
&lt;element name="some-tasks" optional="yes"/&gt;
&lt;sequential&gt;
&lt;echo&gt;v is ${v}&lt;/echo&gt;
&lt;echo&gt;v is @{v}&lt;/echo&gt;
&lt;some-tasks/&gt;
&lt;/sequential&gt;
&lt;/macrodef&gt;
@@ -122,7 +131,7 @@
&lt;echo&gt;this is a test&lt;/echo&gt;
&lt;/some-tasks&gt;
&lt;/testing&gt;
</pre>
</pre>
</blockquote>
<p>
The following fragment defines a task called &lt;call-cc&gt; which
@@ -132,29 +141,29 @@
<a href="http://ant-contrib.sourceforge.net/">ant-contrib</a> project.
</p>
<blockquote>
<pre>
<pre class="code">
&lt;macrodef name="call-cc"&gt;
&lt;attribute name="target"/&gt;
&lt;attribute name="link"/&gt;
&lt;attribute name="target.dir"/&gt;
&lt;element name="cc-elements"/&gt;
&lt;sequential&gt;
&lt;mkdir dir="${obj.dir}/${target}"/&gt;
&lt;mkdir dir="${target.dir}"/&gt;
&lt;cc link="${link}" objdir="${obj.dir}/${target}"
outfile="${target.dir}/${target}"&gt;
&lt;mkdir dir="${obj.dir}/@{target}"/&gt;
&lt;mkdir dir="@{target.dir}"/&gt;
&lt;cc link="@{link}" objdir="${obj.dir}/@{target}"
outfile="@{target.dir}/@{target}"&gt;
&lt;compiler refid="compiler.options"/&gt;
&lt;cc-elements/&gt;
&lt;/cc&gt;
&lt;/sequential&gt;
&lt;/macrodef&gt;
</pre>
</pre>
</blockquote>
<p>
This then can be used as follows:
</p>
<blockquote>
<pre>
<pre class="code">
&lt;call-cc target="unittests" link="executable"
target.dir="${build.bin.dir}"&gt;
&lt;cc-elements&gt;
@@ -165,7 +174,7 @@
&lt;linker refid="linker-libs"/&gt;
&lt;/cc-elements&gt;
&lt;/call-cc&gt;
</pre>
</pre>
</blockquote>
<hr>
<p align="center">Copyright &copy; 2003 Apache Software


+ 2
- 2
docs/manual/CoreTypes/antlib.html View File

@@ -89,7 +89,7 @@
&lt;attribute name="dir"/&gt;
&lt;sequential&gt;
&lt;antcontrib:shellscript shell="bash"&gt; &lt;!-- HERE --&gt;
ls -Rl ${dir}
ls -Rl @{dir}
&lt;/antcontrib:shellscript&gt;
&lt;/sequential&gt;
&lt;/macrodef&gt;
@@ -132,7 +132,7 @@
&lt;element name="do"/&gt;
&lt;sequential&gt;
&lt;current:if&gt;
&lt;current:isallowed test="${action}"/&gt;
&lt;current:isallowed test="@{action}"/&gt;
&lt;current:then&gt;
&lt;current:do/&gt;
&lt;/current:then&gt;


+ 14
- 4
src/etc/testcases/taskdefs/macrodef.xml View File

@@ -4,7 +4,7 @@
<macrodef name="my.echo">
<attribute name="text"/>
<sequential>
<echo message="${text}"/>
<echo message="@{text}"/>
</sequential>
</macrodef>
<my.echo text="Hello World"/>
@@ -14,7 +14,7 @@
<macrodef name="my.echo">
<attribute name="text"/>
<sequential>
<echo>${text}</echo>
<echo>@{text}</echo>
</sequential>
</macrodef>
<my.echo text="Inner Text"/>
@@ -25,7 +25,7 @@
<attribute name="text"/>
<attribute name="text"/>
<sequential>
<echo>${text}</echo>
<echo>@{text}</echo>
</sequential>
</macrodef>
</target>
@@ -44,7 +44,7 @@
<macrodef name="echo" uri="abc">
<attribute name="text"/>
<sequential>
<echo message="${text}"/>
<echo message="@{text}"/>
</sequential>
</macrodef>
<x:echo xmlns:x="abc" text="Hello World"/>
@@ -65,4 +65,14 @@
</nested>
</target>

<target name="double">
<macrodef name="double">
<attribute name="prop"/>
<sequential>
<echo>@@{prop} is '@{prop}', value of $${@{prop}} is '${@{prop}}'</echo>
</sequential>
</macrodef>
<property name="property" value="A property value"/>
<double prop="property"/>
</target>
</project>

+ 44
- 8
src/main/org/apache/tools/ant/taskdefs/MacroDef.java View File

@@ -78,8 +78,8 @@ import org.apache.tools.ant.UnknownElement;
public class MacroDef extends AntlibDefinition {
private NestedSequential nestedSequential;
private String name;
private Map attributes = new HashMap();
private Map elements = new HashMap();
private List attributes = new ArrayList();
private Map elements = new HashMap();

/**
* Name of the definition
@@ -170,7 +170,7 @@ public class MacroDef extends AntlibDefinition {
/**
* @return the nested Attributes
*/
public Map getAttributes() {
public List getAttributes() {
return attributes;
}

@@ -221,12 +221,15 @@ public class MacroDef extends AntlibDefinition {
throw new BuildException(
"the attribute nested element needed a \"name\" attribute");
}
if (attributes.get(attribute.getName()) != null) {
throw new BuildException(
"the attribute " + attribute.getName()
+ " has already been specified");
for (int i = 0; i < attributes.size(); ++i) {
if (((Attribute) attributes.get(i)).getName().equals(
attribute.getName())) {
throw new BuildException(
"the attribute " + attribute.getName()
+ " has already been specified");
}
}
attributes.put(attribute.getName(), attribute);
attributes.add(attribute);
}

/**
@@ -347,6 +350,13 @@ public class MacroDef extends AntlibDefinition {
}
return true;
}

/**
* @return a hash code value for this object.
*/
public int hashCode() {
return objectHashCode(defaultValue) + objectHashCode(name);
}
}

/**
@@ -416,6 +426,13 @@ public class MacroDef extends AntlibDefinition {
}
return optional == other.optional;
}

/**
* @return a hash code value for this object.
*/
public int hashCode() {
return objectHashCode(name) + (optional ? 1 : 0);
}
}

/**
@@ -463,6 +480,17 @@ public class MacroDef extends AntlibDefinition {
return true;
}

/**
* @return a hash code value for this object.
*/
public int hashCode() {
return objectHashCode(name)
+ objectHashCode(getURI())
+ objectHashCode(nestedSequential)
+ objectHashCode(attributes)
+ objectHashCode(elements);
}

/**
* extends AntTypeDefinition, on create
* of the object, the template macro definition
@@ -526,4 +554,12 @@ public class MacroDef extends AntlibDefinition {
return macroDef.equals(otherDef.macroDef);
}
}

private static int objectHashCode(Object o) {
if (o == null) {
return 0;
} else {
return o.hashCode();
}
}
}

+ 40
- 18
src/main/org/apache/tools/ant/taskdefs/MacroInstance.java View File

@@ -87,7 +87,6 @@ public class MacroInstance extends Task implements DynamicConfigurator {
private Map nsElements = null;
private Map presentElements = new HashMap();
private Hashtable localProperties = new Hashtable();

/**
* Called from MacroDef.MyAntTypeDefinition#create()
@@ -142,7 +141,7 @@ public class MacroInstance extends Task implements DynamicConfigurator {
}
return nsElements;
}
/**
* Embedded element in macro instance
*/
@@ -166,11 +165,15 @@ public class MacroInstance extends Task implements DynamicConfigurator {
}
}

private static final int STATE_NORMAL = 0;
private static final int STATE_NORMAL = 0;
private static final int STATE_EXPECT_BRACKET = 1;
private static final int STATE_EXPECT_NAME = 2;
private static final int STATE_EXPECT_NAME = 2;
private static final int STATE_EXPECT_EXCAPE = 3;

private String macroSubs(String s, Map macroMapping) {
if (s == null) {
return null;
}
StringBuffer ret = new StringBuffer();
StringBuffer macroName = null;
boolean inMacro = false;
@@ -179,48 +182,67 @@ public class MacroInstance extends Task implements DynamicConfigurator {
char ch = s.charAt(i);
switch (state) {
case STATE_NORMAL:
if (ch == '$') {
state = 1;
if (ch == '@') {
state = STATE_EXPECT_BRACKET;
} else {
ret.append(ch);
}
}
break;
case STATE_EXPECT_BRACKET:
if (ch == '{') {
state = 2;
state = STATE_EXPECT_NAME;
macroName = new StringBuffer();
} else if (ch == '@') {
state = STATE_EXPECT_EXCAPE;
} else {
state = 0;
ret.append('$');
state = STATE_NORMAL;
ret.append('@');
ret.append(ch);
}
break;
case STATE_EXPECT_NAME:
if (ch == '}') {
state = 0;
state = STATE_NORMAL;
String name = macroName.toString();
String value = (String) macroMapping.get(name);
if (value == null) {
ret.append("${" + name + "}");
ret.append("@{" + name + "}");
} else {
ret.append(value);
}
macroName = null;
} else {
macroName.append(s.charAt(i));
macroName.append(ch);
}
break;
case STATE_EXPECT_EXCAPE:
state = STATE_NORMAL;
if (ch == '{') {
ret.append("@");
} else {
ret.append("@@");
}
ret.append(ch);
break;
default:
break;
}
}
switch (state) {
case STATE_NORMAL:
break;
case STATE_EXPECT_BRACKET:
ret.append('$');
ret.append('@');
break;
case STATE_EXPECT_NAME:
ret.append("${");
ret.append("@{");
ret.append(macroName.toString());
break;
case STATE_EXPECT_EXCAPE:
ret.append("@@");
break;
default:
break;
}

return ret.toString();
@@ -294,12 +316,12 @@ public class MacroInstance extends Task implements DynamicConfigurator {
public void execute() {
localProperties = new Hashtable();
Set copyKeys = new HashSet(map.keySet());
for (Iterator i = macroDef.getAttributes().values().iterator();
i.hasNext();) {
for (Iterator i = macroDef.getAttributes().iterator(); i.hasNext();) {
MacroDef.Attribute attribute = (MacroDef.Attribute) i.next();
String value = (String) map.get(attribute.getName());
if (value == null) {
value = attribute.getDefault();
value = macroSubs(value, localProperties);
}
if (value == null) {
throw new BuildException(


+ 5
- 0
src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java View File

@@ -98,5 +98,10 @@ public class MacroDefTest extends BuildFileTest {
expectLog("nested", "A nested element");
}

public void testDouble() {
expectLog(
"double",
"@{prop} is 'property', value of ${property} is 'A property value'");
}
}


Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit