[llvm-commits] [hlvm] r38138 - in /hlvm/trunk: hlvm/AST/Type.cpp hlvm/Reader/XML/HLVM.rng hlvm/Reader/XML/XMLReader.cpp hlvm/Writer/XML/XMLWriter.cpp test/return0/helloworld.hlx test/return0/return0.hlx test/xml2xml/alias.hlx test/xml2xml/array.hlx test/xml2xml/bundle.hlx test/xml2xml/doc.hlx test/xml2xml/enumeration.hlx test/xml2xml/intrinsics.hlx test/xml2xml/pointer.hlx test/xml2xml/resolve.hlx test/xml2xml/return.hlx test/xml2xml/signature.hlx test/xml2xml/structure.hlx test/xml2xml/var.hlx test/xml2xml/vector.hlx
Reid Spencer
reid at x10sys.com
Sat Jul 7 17:00:13 PDT 2007
Author: reid
Date: Sat Jul 7 19:00:12 2007
New Revision: 38138
URL: http://llvm.org/viewvc/llvm-project?rev=38138&view=rev
Log:
Refine the XML input a little:
1. The "name" attributes are all now "id" attributes. This is both
shorter, easier to read, and more standards compliant.
2. Got the "hellowworld.hlx" to validate. This was both reshaping
the program as well as the HLVM.rng schema.
3. Got the "return0.hlx" program to validate.
4. Adjusted some element tokens.
5. Added some new operators to the schema.
Modified:
hlvm/trunk/hlvm/AST/Type.cpp
hlvm/trunk/hlvm/Reader/XML/HLVM.rng
hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp
hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp
hlvm/trunk/test/return0/helloworld.hlx
hlvm/trunk/test/return0/return0.hlx
hlvm/trunk/test/xml2xml/alias.hlx
hlvm/trunk/test/xml2xml/array.hlx
hlvm/trunk/test/xml2xml/bundle.hlx
hlvm/trunk/test/xml2xml/doc.hlx
hlvm/trunk/test/xml2xml/enumeration.hlx
hlvm/trunk/test/xml2xml/intrinsics.hlx
hlvm/trunk/test/xml2xml/pointer.hlx
hlvm/trunk/test/xml2xml/resolve.hlx
hlvm/trunk/test/xml2xml/return.hlx
hlvm/trunk/test/xml2xml/signature.hlx
hlvm/trunk/test/xml2xml/structure.hlx
hlvm/trunk/test/xml2xml/var.hlx
hlvm/trunk/test/xml2xml/vector.hlx
Modified: hlvm/trunk/hlvm/AST/Type.cpp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/AST/Type.cpp?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/hlvm/AST/Type.cpp (original)
+++ hlvm/trunk/hlvm/AST/Type.cpp Sat Jul 7 19:00:12 2007
@@ -193,7 +193,7 @@
break;
case 32:
if (exponent == 11)
- return "f43";
+ return "f44";
break;
case 52:
if (exponent == 11)
Modified: hlvm/trunk/hlvm/Reader/XML/HLVM.rng
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/XML/HLVM.rng?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Reader/XML/HLVM.rng (original)
+++ hlvm/trunk/hlvm/Reader/XML/HLVM.rng Sat Jul 7 19:00:12 2007
@@ -41,7 +41,7 @@
ns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng">
<start>
- <ref name="HLVM.elem"/>
+ <ref name="hlvm.elem"/>
</start>
<!-- PATTERN DEFINITIONS FOR DATA TYPES -->
@@ -118,7 +118,7 @@
<!-- PATTERNS THAT DEFINE name AND type ATTRIBUTES -->
<define name="Named_Element.pat">
- <attribute name="name">
+ <attribute name="id">
<ref name="Identifier.type"/>
</attribute>
<ref name="Documentation.pat"/>
@@ -132,7 +132,7 @@
</define>
<define name="Named_Typed_Element.pat">
- <attribute name="name">
+ <attribute name="id">
<ref name="Identifier.type"/>
</attribute>
<attribute name="type">
@@ -142,18 +142,19 @@
</define>
<!-- HLVM PATTERN -->
- <define name="HLVM.elem">
+ <define name="hlvm.elem">
<element name="hlvm">
<attribute name="pubid"><data type="anyURI"/></attribute>
+ <ref name="Documentation.pat"/>
<oneOrMore>
- <ref name="Bundle.elem"/>
+ <ref name="bundle.elem"/>
</oneOrMore>
</element>
</define>
<!--BUNDLES PATTERN -->
- <define name="Bundle.elem">
+ <define name="bundle.elem">
<element name="bundle">
<ref name="Named_Element.pat"/>
<ref name="Documentation.pat"/>
@@ -164,19 +165,18 @@
</optional>
<zeroOrMore>
<choice>
- <ref name="Alias.elem"/>
- <ref name="Array.elem"/>
- <ref name="Atom.elem"/>
- <ref name="Bundle.elem"/>
- <ref name="Enumeration.elem"/>
- <ref name="Function.elem"/>
- <ref name="Pointer.elem"/>
- <ref name="Structure.elem"/>
- <ref name="Signature.elem"/>
- <ref name="Vector.elem"/>
- <ref name="Variable.elem"/>
- <ref name="Function.elem"/>
- <ref name="Program.elem"/>
+ <ref name="alias.elem"/>
+ <ref name="array.elem"/>
+ <ref name="atom.elem"/>
+ <ref name="enumeration.elem"/>
+ <ref name="pointer.elem"/>
+ <ref name="structure.elem"/>
+ <ref name="signature.elem"/>
+ <ref name="vector.elem"/>
+ <ref name="constant.elem"/>
+ <ref name="variable.elem"/>
+ <ref name="function.elem"/>
+ <ref name="program.elem"/>
</choice>
</zeroOrMore>
</element>
@@ -196,14 +196,14 @@
<!--PATTERNS FOR DEFINING TYPES -->
- <define name="Alias.elem">
+ <define name="alias.elem">
<element name="alias">
<ref name="Named_Element.pat"/>
<attribute name="renames"><ref name="Identifier.type"/></attribute>
</element>
</define>
- <define name="Intrinsic.elem">
+ <define name="intrinsic.elem">
<element name="intrinsic">
<attribute name="is">
<ref name="Intrinsic_Atoms.type"/>
@@ -211,7 +211,7 @@
</element>
</define>
- <define name="Signed.elem">
+ <define name="signed.elem">
<element name="signed">
<attribute name="bits">
<ref name="Integer.type"/>
@@ -219,7 +219,7 @@
</element>
</define>
- <define name="Unsigned.elem">
+ <define name="unsigned.elem">
<element name="unsigned">
<attribute name="bits">
<ref name="Integer.type"/>
@@ -227,7 +227,7 @@
</element>
</define>
- <define name="Range.elem">
+ <define name="range.elem">
<element name="range">
<attribute name="min">
<ref name="Integer.type"/>
@@ -238,7 +238,7 @@
</element>
</define>
- <define name="Real.elem">
+ <define name="real.elem">
<element name="real">
<attribute name="precision">
<ref name="Integer.type"/>
@@ -246,15 +246,15 @@
</element>
</define>
- <define name="Atom.elem">
+ <define name="atom.elem">
<element name="atom">
<ref name="Named_Element.pat"/>
<choice>
- <ref name="Intrinsic.elem"/>
- <ref name="Signed.elem"/>
- <ref name="Unsigned.elem"/>
- <ref name="Range.elem"/>
- <ref name="Real.elem"/>
+ <ref name="intrinsic.elem"/>
+ <ref name="signed.elem"/>
+ <ref name="unsigned.elem"/>
+ <ref name="range.elem"/>
+ <ref name="real.elem"/>
</choice>
</element>
</define>
@@ -265,7 +265,7 @@
<value>bool</value>
<value>char</value>
<value>f32</value>
- <value>f43</value>
+ <value>f44</value>
<value>f64</value>
<value>f80</value>
<value>f128</value>
@@ -275,6 +275,7 @@
<value>s32</value>
<value>s64</value>
<value>s128</value>
+ <value>text</value>
<value>u8</value>
<value>u16</value>
<value>u32</value>
@@ -284,7 +285,7 @@
</choice>
</define>
- <define name="Enumeration.elem">
+ <define name="enumeration.elem">
<element name="enumeration">
<ref name="Named_Element.pat"/>
<oneOrMore>
@@ -298,14 +299,14 @@
</element>
</define>
- <define name="Pointer.elem">
+ <define name="pointer.elem">
<element name="pointer">
<ref name="Named_Element.pat"/>
<attribute name="to"><ref name="Identifier.type"/></attribute>
</element>
</define>
- <define name="Vector.elem">
+ <define name="vector.elem">
<element name="vector">
<ref name="Named_Element.pat"/>
<attribute name="of">
@@ -315,7 +316,7 @@
</element>
</define>
- <define name="Array.elem">
+ <define name="array.elem">
<element name="array">
<ref name="Named_Element.pat"/>
<attribute name="length"><data type="nonNegativeInteger"/></attribute>
@@ -323,7 +324,7 @@
</element>
</define>
- <define name="Structure.elem">
+ <define name="structure.elem">
<element name="structure">
<ref name="Named_Element.pat"/>
<zeroOrMore>
@@ -334,7 +335,7 @@
</element>
</define>
- <define name="Signature.elem">
+ <define name="signature.elem">
<element name="signature">
<ref name="Named_Element.pat"/>
<attribute name="result"><ref name="Identifier.type"/></attribute>
@@ -349,7 +350,7 @@
</element>
</define>
- <define name="Opaque.elem">
+ <define name="opaque.elem">
<element name="opaque">
<ref name="Named_Element.pat"/>
<empty/>
@@ -358,14 +359,11 @@
<!--PATTERNS FOR VARIABLES-->
- <define name="Variable.elem">
- <element name="var">
+ <define name="variable.elem">
+ <element name="variable">
<ref name="Named_Typed_Element.pat"/>
<optional>
<choice>
- <element name="const">
- <ref name="Constant.pat"/>
- </element>
<element name="init">
<ref name="Constant.pat"/>
</element>
@@ -394,55 +392,97 @@
<!--PATTERNS FOR FUNCTIONS -->
- <define name="Function.elem">
+ <define name="function.elem">
<element name="function">
<ref name="Named_Typed_Element.pat"/>
<optional>
<attribute name="linkage"><ref name="Linkage.type"/></attribute>
</optional>
<zeroOrMore>
- <ref name="Block.elem"/>
+ <ref name="block.elem"/>
</zeroOrMore>
</element>
</define>
- <define name="Program.elem">
+ <define name="program.elem">
<element name="program">
<ref name="Named_Element.pat"/>
<optional>
<attribute name="linkage"><ref name="Linkage.type"/></attribute>
</optional>
<zeroOrMore>
- <ref name="Block.elem"/>
+ <ref name="block.elem"/>
</zeroOrMore>
</element>
</define>
- <define name="Block.elem">
+ <define name="Block.pat">
+ <oneOrMore>
+ <choice>
+ <ref name="variable.elem"/>
+ <ref name="Operators.pat"/>
+ <ref name="block.elem"/>
+ </choice>
+ </oneOrMore>
+ </define>
+
+ <define name="block.elem">
<element name="block">
<optional>
<attribute name="label"><ref name="Identifier.type"/></attribute>
</optional>
- <oneOrMore>
- <ref name="Operator.pat"/>
- </oneOrMore>
+ <ref name="Block.pat"/>
+ </element>
+ </define>
+
+ <!-- PATTERNS FOR DEFINING NAMED CONSTANTS -->
+
+ <define name="constant.elem">
+ <element name="constant">
+ <ref name="Named_Typed_Element.pat"/>
+ <ref name="Constant.pat"/>
</element>
</define>
<define name="Constant.pat">
<choice>
- <ref name="Reference.elem"/>
<ref name="Literal.pat"/>
+ <!--
+ FIXME: This is hacked out right now because it causes infinite recursion
+ in libxml2 function xmlRelaxNGGetElements. Debugging it didn't help me
+ find out whey.
+ <ref name="ConstantExpression.pat"/>
+ -->
</choice>
</define>
- <define name="Reference.elem">
+ <define name="ref.elem">
<element name="ref">
- <ref name="Named_Element.pat"/>
- <empty/>
+ <attribute name="id">
+ <ref name="Identifier.type"/>
+ </attribute>
+ <ref name="Documentation.pat"/>
</element>
</define>
+ <!-- PATTERNS FOR CONSTANT EXPRESSIONS -->
+ <define name="ConstantExpression.pat">
+ <choice>
+ <ref name="index.elem"/>
+ <ref name="cast.elem"/>
+ <ref name="select.elem"/>
+ <ref name="sizeof.elem"/>
+ <ref name="addrof.elem"/>
+ <ref name="extract.elem"/>
+ <ref name="insert.elem"/>
+ <ref name="shuffle.elem"/>
+ <ref name="ComparisonOperators.pat"/>
+ <ref name="UnaryArithmeticOperators.pat"/>
+ <ref name="BinaryArithmeticOperators.pat"/>
+ <ref name="BinaryBitwiseOperators.pat"/>
+ </choice>
+ </define>
+
<!-- PATTERNS FOR LITERAL CONSTANTS -->
<define name="Literal.pat">
@@ -455,7 +495,7 @@
<ref name="Null_Literal.elem"/>
<ref name="Array_Literal.elem"/>
<ref name="Vector_Literal.elem"/>
- <ref name="Aggregate_Literal.elem"/>
+ <ref name="Structure_Literal.elem"/>
</choice>
</define>
@@ -479,7 +519,9 @@
<define name="Typed_Literal.pat">
<optional>
- <attribute name="type"><ref name="Identifier.type"/></attribute>
+ <attribute name="type">
+ <ref name="Identifier.type"/>
+ </attribute>
</optional>
</define>
@@ -545,18 +587,32 @@
<define name="Boolean_Literal.elem">
<choice>
- <element name="true"><empty/></element>
- <element name="false"><empty/></element>
+ <element name="true">
+ <empty/>
+ </element>
+ <element name="false">
+ <empty/>
+ </element>
</choice>
</define>
<define name="Character_Literal.elem">
- <element name="char"><ref name="Character.type"/></element>
+ <element name="char">
+ <ref name="Character.type"/>
+ </element>
+ </define>
+
+ <define name="Text_Literal.elem">
+ <element name="text">
+ <text/>
+ </element>
</define>
<define name="Character.type">
<choice>
- <data type="string"><param name="length">1</param></data>
+ <data type="string">
+ <param name="length">1</param>
+ </data>
<data type="string">
<param name="length">5</param>
<param name="pattern">[#][0-9A-Fa-f]{4,4}</param>
@@ -566,8 +622,12 @@
<define name="Real_Literal.elem">
<choice>
- <element name="flt"><ref name="Real.type"/></element>
- <element name="dbl"><ref name="Real.type"/></element>
+ <element name="flt">
+ <ref name="Real.type"/>
+ </element>
+ <element name="dbl">
+ <ref name="Real.type"/>
+ </element>
</choice>
</define>
@@ -579,16 +639,14 @@
</data>
</define>
- <define name="Text_Literal.elem">
- <element name="text"><text/></element>
- </define>
-
<define name="Null_Literal.elem">
- <element name="null"><empty/></element>
+ <element name="null">
+ <empty/>
+ </element>
</define>
<define name="Array_Literal.elem">
- <element name="array">
+ <element name="arr">
<ref name="Typed_Element.pat"/>
<oneOrMore>
<ref name="Constant.pat"/>
@@ -597,7 +655,7 @@
</define>
<define name="Vector_Literal.elem">
- <element name="vector">
+ <element name="vect">
<ref name="Typed_Element.pat"/>
<oneOrMore>
<ref name="Constant.pat"/>
@@ -605,8 +663,8 @@
</element>
</define>
- <define name="Aggregate_Literal.elem">
- <element name="aggregate">
+ <define name="Structure_Literal.elem">
+ <element name="struct">
<ref name="Typed_Element.pat"/>
<oneOrMore>
<ref name="Constant.pat"/>
@@ -616,13 +674,234 @@
<!-- PATTERNS FOR OPERATORS -->
- <define name="Operator.pat">
+ <define name="Value.pat">
+ <choice>
+ <ref name="Operators.pat"/>
+ <ref name="Constant.pat"/>
+ </choice>
+ </define>
+
+ <define name="Location.pat">
+ <choice>
+ <ref name="ref.elem"/>
+ <ref name="index.elem"/>
+ </choice>
+ </define>
+
+ <define name="Operators.pat">
<choice>
+ <ref name="var.elem"/>
+ <ref name="ComparisonOperators.pat"/>
+ <ref name="UnaryArithmeticOperators.pat"/>
+ <ref name="BinaryArithmeticOperators.pat"/>
+ <ref name="BinaryBitwiseOperators.pat"/>
+ <ref name="MemoryOps.pat"/>
+ <ref name="InputOutputOps.pat"/>
<ref name="ControlFlowOps.pat"/>
<ref name="Literal.pat"/>
</choice>
</define>
+ <define name="cast.elem">
+ <empty/>
+ </define>
+
+ <define name="select.elem">
+ <empty/>
+ </define>
+
+ <define name="sizeof.elem">
+ <empty/>
+ </define>
+
+ <define name="addrof.elem">
+ <ref name="Value.pat"/>
+ </define>
+
+ <define name="extract.elem">
+ <empty/>
+ </define>
+
+ <define name="insert.elem">
+ <empty/>
+ </define>
+
+ <define name="shuffle.elem">
+ <empty/>
+ </define>
+
+ <define name="var.elem">
+ <element name="var">
+ <ref name="Named_Typed_Element.pat"/>
+ </element>
+ </define>
+
+ <define name="MemoryOps.pat">
+ <choice>
+ <ref name="load.elem"/>
+ <ref name="store.elem"/>
+ <ref name="index.elem"/>
+ <ref name="length.elem"/>
+ </choice>
+ </define>
+
+ <define name="load.elem">
+ <element name="load">
+ <ref name="Documentation.pat"/>
+ <ref name="Location.pat"/>
+ </element>
+ </define>
+
+ <define name="store.elem">
+ <element name="store">
+ <ref name="Documentation.pat"/>
+ <ref name="Location.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="index.elem">
+ <element name="index">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <oneOrMore>
+ <ref name="Value.pat"/>
+ </oneOrMore>
+ </element>
+ </define>
+
+ <define name="length.elem">
+ <element name="length">
+ <ref name="Documentation.pat"/>
+ <ref name="Location.pat"/>
+ </element>
+ </define>
+
+ <define name="InputOutputOps.pat">
+ <choice>
+ <ref name="open.elem"/>
+ <ref name="close.elem"/>
+ <ref name="write.elem"/>
+ <!-- <ref name="read.elem"/>
+ <ref name="seek.elem"/>
+ <ref name="tell.elem"/>
+ <ref name="info.elem"/> -->
+ </choice>
+ </define>
+
+ <define name="open.elem">
+ <element name="open">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="close.elem">
+ <element name="close">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="write.elem">
+ <element name="write">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="UnaryArithmeticOperators.pat">
+ <choice>
+ <ref name="neg.elem"/>
+ <ref name="cmpl.elem"/>
+ </choice>
+ </define>
+
+ <define name="neg.elem">
+ <element name="neg">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="cmpl.elem">
+ <element name="cmpl">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="BinaryArithmeticOperators.pat">
+ <choice>
+ <ref name="add.elem"/>
+ <ref name="sub.elem"/>
+ </choice>
+ </define>
+
+ <define name="add.elem">
+ <element name="add">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="sub.elem">
+ <element name="sub">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="BinaryBitwiseOperators.pat">
+ <choice>
+ <ref name="bor.elem"/>
+ <ref name="band.elem"/>
+ </choice>
+ </define>
+
+ <define name="bor.elem">
+ <element name="bor">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="band.elem">
+ <element name="band">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="ComparisonOperators.pat">
+ <choice>
+ <ref name="eq.elem"/>
+ <ref name="ne.elem"/>
+ </choice>
+ </define>
+
+ <define name="eq.elem">
+ <element name="eq">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
+ <define name="ne.elem">
+ <element name="ne">
+ <ref name="Documentation.pat"/>
+ <ref name="Value.pat"/>
+ <ref name="Value.pat"/>
+ </element>
+ </define>
+
<define name="ControlFlowOps.pat">
<choice>
<ref name="Return.elem"/>
@@ -631,8 +910,7 @@
<define name="Return.elem">
<element name="ret">
- <ref name="Operator.pat"/>
+ <ref name="Operators.pat"/>
</element>
</define>
-
</grammar>
Modified: hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp (original)
+++ hlvm/trunk/hlvm/Reader/XML/XMLReader.cpp Sat Jul 7 19:00:12 2007
@@ -252,7 +252,7 @@
inline void
getNameType(xmlNodePtr& cur, std::string& name, std::string& type)
{
- name = getAttribute(cur,"name");
+ name = getAttribute(cur,"id");
type = getAttribute(cur,"type");
}
@@ -416,7 +416,7 @@
XMLReaderImpl::parseAlias(xmlNodePtr& cur)
{
hlvmAssert(getToken(cur->name)==TKN_alias);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
std::string type = getAttribute(cur,"renames");
AliasType* alias =
ast->new_AliasType(name,ast->resolveType(type),getLocator(cur));
@@ -429,7 +429,7 @@
{
hlvmAssert(getToken(cur->name)==TKN_atom);
Locator* loc = getLocator(cur);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
xmlNodePtr child = cur->children;
Documentation* theDoc = parseDocumentation(child);
child = (theDoc==0 ? child : child->next );
@@ -448,7 +448,7 @@
case TKN_char: result=ast->new_CharacterType(name,loc); break;
case TKN_f128: result=ast->new_f128(name,loc); break;
case TKN_f32: result=ast->new_f32(name,loc); break;
- case TKN_f43: result=ast->new_f44(name,loc); break;
+ case TKN_f44: result=ast->new_f44(name,loc); break;
case TKN_f64: result=ast->new_f64(name,loc); break;
case TKN_f80: result=ast->new_f80(name,loc); break;
case TKN_octet:result=ast->new_OctetType(name,loc); break;
@@ -529,7 +529,7 @@
{
hlvmAssert(getToken(cur->name)==TKN_enumeration);
Locator* loc = getLocator(cur);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
EnumerationType* en = ast->new_EnumerationType(name,loc);
xmlNodePtr child = checkDoc(cur,en);
while (child && skipBlanks(child) && child->type == XML_ELEMENT_NODE) {
@@ -546,7 +546,7 @@
{
hlvmAssert(getToken(cur->name)==TKN_pointer);
Locator* loc = getLocator(cur);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
std::string type = getAttribute(cur,"to");
PointerType* result =
ast->new_PointerType(name,ast->resolveType(type),loc);
@@ -559,7 +559,7 @@
{
hlvmAssert(getToken(cur->name)==TKN_array);
Locator* loc = getLocator(cur);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
std::string type = getAttribute(cur,"of");
const char* len = getAttribute(cur,"length");
ArrayType* result = ast->new_ArrayType(
@@ -573,7 +573,7 @@
{
hlvmAssert(getToken(cur->name)==TKN_vector);
Locator* loc = getLocator(cur);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
std::string type = getAttribute(cur,"of");
const char* len = getAttribute(cur,"length");
VectorType* result =
@@ -588,13 +588,13 @@
{
hlvmAssert(getToken(cur->name)==TKN_structure);
Locator* loc = getLocator(cur);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
StructureType* struc = ast->new_StructureType(name,loc);
xmlNodePtr child = checkDoc(cur,struc);
while (child && skipBlanks(child) && child->type == XML_ELEMENT_NODE) {
hlvmAssert(getToken(child->name) == TKN_field &&
"Structure only has fields");
- std::string name = getAttribute(child,"name");
+ std::string name = getAttribute(child,"id");
std::string type = getAttribute(child,"type");
AliasType* alias = ast->new_AliasType(name,ast->resolveType(type),loc);
alias->setParent(struc);
@@ -609,7 +609,7 @@
{
hlvmAssert(getToken(cur->name)==TKN_signature);
Locator* loc = getLocator(cur);
- std::string name = getAttribute(cur,"name");
+ std::string name = getAttribute(cur,"id");
std::string result = getAttribute(cur,"result");
const char* varargs = getAttribute(cur,"varargs",false);
SignatureType* sig =
@@ -619,7 +619,7 @@
xmlNodePtr child = checkDoc(cur,sig);
while (child && skipBlanks(child) && child->type == XML_ELEMENT_NODE) {
hlvmAssert(getToken(child->name) == TKN_arg && "Signature only has args");
- std::string name = getAttribute(child,"name");
+ std::string name = getAttribute(child,"id");
std::string type = getAttribute(child,"type");
AliasType* alias = ast->new_AliasType(name,ast->resolveType(type),loc);
alias->setParent(sig);
@@ -632,7 +632,7 @@
Variable*
XMLReaderImpl::parseVariable(xmlNodePtr& cur)
{
- hlvmAssert(getToken(cur->name)==TKN_var);
+ hlvmAssert(getToken(cur->name)==TKN_variable);
Locator* loc = getLocator(cur);
std::string name, type;
getNameType(cur, name, type);
@@ -712,7 +712,7 @@
{
hlvmAssert(getToken(cur->name) == TKN_program && "Expecting program element");
Locator* loc = getLocator(cur);
- std::string name(getAttribute(cur, "name"));
+ std::string name(getAttribute(cur, "id"));
Program* program = ast->new_Program(name,loc);
xmlNodePtr child = cur->children;
if (child && skipBlanks(child) && child->type == XML_ELEMENT_NODE) {
@@ -728,7 +728,7 @@
XMLReaderImpl::parseBundle(xmlNodePtr& cur)
{
hlvmAssert(getToken(cur->name) == TKN_bundle && "Expecting bundle element");
- std::string pubid(getAttribute(cur, "name"));
+ std::string pubid(getAttribute(cur, "id"));
Locator* loc = getLocator(cur);
Bundle* bundle = ast->new_Bundle(pubid,loc);
xmlNodePtr child = cur->children;
@@ -743,19 +743,19 @@
bundle->setDoc(theDoc);
break;
}
- case TKN_import : { n = parseImport(child); break; }
- case TKN_bundle : { n = parseBundle(child); break; }
- case TKN_alias : { n = parseAlias(child); break; }
- case TKN_atom : { n = parseAtom(child); break; }
- case TKN_enumeration: { n = parseEnumeration(child); break; }
- case TKN_pointer : { n = parsePointer(child); break; }
- case TKN_array : { n = parseArray(child); break; }
- case TKN_vector : { n = parseVector(child); break; }
- case TKN_structure: { n = parseStructure(child); break; }
- case TKN_signature: { n = parseSignature(child); break; }
- case TKN_var : { n = parseVariable(child); break; }
- case TKN_program : { n = parseProgram(child); break; }
- case TKN_function : { n = parseFunction(child); break; }
+ case TKN_import : { n = parseImport(child); break; }
+ case TKN_bundle : { n = parseBundle(child); break; }
+ case TKN_alias : { n = parseAlias(child); break; }
+ case TKN_atom : { n = parseAtom(child); break; }
+ case TKN_enumeration : { n = parseEnumeration(child); break; }
+ case TKN_pointer : { n = parsePointer(child); break; }
+ case TKN_array : { n = parseArray(child); break; }
+ case TKN_vector : { n = parseVector(child); break; }
+ case TKN_structure : { n = parseStructure(child); break; }
+ case TKN_signature : { n = parseSignature(child); break; }
+ case TKN_variable : { n = parseVariable(child); break; }
+ case TKN_program : { n = parseProgram(child); break; }
+ case TKN_function : { n = parseFunction(child); break; }
default:
{
hlvmDeadCode("Invalid content for bundle");
Modified: hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp (original)
+++ hlvm/trunk/hlvm/Writer/XML/XMLWriter.cpp Sat Jul 7 19:00:12 2007
@@ -187,7 +187,7 @@
XMLWriterImpl::WriterPass::put(AliasType* t)
{
startElement("alias");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
writeAttribute("renames",t->getType());
putDoc(t);
}
@@ -195,7 +195,7 @@
XMLWriterImpl::WriterPass::put(AnyType* t)
{
startElement("atom");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
startElement("intrinsic");
writeAttribute("is","any");
@@ -206,7 +206,7 @@
XMLWriterImpl::WriterPass::put(BooleanType* t)
{
startElement("atom");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
startElement("intrinsic");
writeAttribute("is","bool");
@@ -217,7 +217,7 @@
XMLWriterImpl::WriterPass::put(CharacterType* t)
{
startElement("atom");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
startElement("intrinsic");
writeAttribute("is","char");
@@ -228,7 +228,7 @@
XMLWriterImpl::WriterPass::put(IntegerType* t)
{
startElement("atom");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
const char* primName = t->getPrimitiveName();
if (primName) {
@@ -248,7 +248,7 @@
XMLWriterImpl::WriterPass::put(RangeType* t)
{
startElement("range");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
writeAttribute("min",t->getMin());
writeAttribute("max",t->getMax());
putDoc(t);
@@ -258,7 +258,7 @@
XMLWriterImpl::WriterPass::put(EnumerationType* t)
{
startElement("enumeration");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
for (EnumerationType::const_iterator I = t->begin(), E = t->end();
I != E; ++I)
@@ -273,7 +273,7 @@
XMLWriterImpl::WriterPass::put(RealType* t)
{
startElement("atom");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
const char* primName = t->getPrimitiveName();
if (primName) {
@@ -292,7 +292,7 @@
XMLWriterImpl::WriterPass::put(OctetType* t)
{
startElement("atom");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
startElement("intrinsic");
writeAttribute("is","octet");
@@ -303,7 +303,7 @@
XMLWriterImpl::WriterPass::put(VoidType* t)
{
startElement("atom");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
startElement("intrinsic");
writeAttribute("is","void");
@@ -314,7 +314,7 @@
XMLWriterImpl::WriterPass::put(PointerType* t)
{
startElement("pointer");
- writeAttribute("name", t->getName());
+ writeAttribute("id", t->getName());
writeAttribute("to", t->getTargetType());
putDoc(t);
}
@@ -323,7 +323,7 @@
XMLWriterImpl::WriterPass::put(ArrayType* t)
{
startElement("array");
- writeAttribute("name", t->getName());
+ writeAttribute("id", t->getName());
writeAttribute("of", t->getElementType());
writeAttribute("length", t->getMaxSize());
putDoc(t);
@@ -333,7 +333,7 @@
XMLWriterImpl::WriterPass::put(VectorType* t)
{
startElement("vector");
- writeAttribute("name", t->getName());
+ writeAttribute("id", t->getName());
writeAttribute("of", t->getElementType());
writeAttribute("length", t->getSize());
putDoc(t);
@@ -343,12 +343,12 @@
XMLWriterImpl::WriterPass::put(StructureType* t)
{
startElement("structure");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
putDoc(t);
for (StructureType::iterator I = t->begin(), E = t->end(); I != E; ++I) {
startElement("field");
AliasType* alias = cast<AliasType>(*I);
- writeAttribute("name",alias->getName());
+ writeAttribute("id",alias->getName());
writeAttribute("type",alias->getType());
putDoc(alias);
endElement();
@@ -359,14 +359,14 @@
XMLWriterImpl::WriterPass::put(SignatureType* t)
{
startElement("signature");
- writeAttribute("name",t->getName());
+ writeAttribute("id",t->getName());
writeAttribute("result",t->getResultType());
writeAttribute("varargs",t->isVarArgs() ? "true" : "false");
putDoc(t);
for (SignatureType::iterator I = t->begin(), E = t->end(); I != E; ++I) {
startElement("arg");
AliasType* alias = cast<AliasType>(*I);
- writeAttribute("name",alias->getName());
+ writeAttribute("id",alias->getName());
writeAttribute("type",alias->getType());
putDoc(alias);
endElement();
@@ -386,8 +386,8 @@
void
XMLWriterImpl::WriterPass::put(Variable* v)
{
- startElement("var");
- writeAttribute("name",v->getName());
+ startElement("variable");
+ writeAttribute("id",v->getName());
writeAttribute("type",v->getType()->getName());
putDoc(v);
}
@@ -396,7 +396,7 @@
XMLWriterImpl::WriterPass::put(Function* f)
{
startElement("function");
- writeAttribute("name",f->getName());
+ writeAttribute("id",f->getName());
writeAttribute("type",f->getSignature()->getName());
writeAttribute("linkage",getLinkageKind(f->getLinkageKind()));
putDoc(f);
@@ -406,7 +406,7 @@
XMLWriterImpl::WriterPass::put(Program* p)
{
startElement("program");
- writeAttribute("name",p->getName());
+ writeAttribute("id",p->getName());
putDoc(p);
}
@@ -430,7 +430,7 @@
XMLWriterImpl::WriterPass::put(Bundle* b)
{
startElement("bundle");
- writeAttribute("name",b->getName());
+ writeAttribute("id",b->getName());
putDoc(b);
}
Modified: hlvm/trunk/test/return0/helloworld.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/return0/helloworld.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/return0/helloworld.hlx (original)
+++ hlvm/trunk/test/return0/helloworld.hlx Sat Jul 7 19:00:12 2007
@@ -1,24 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng"
pubid="http://hlvm.org/src/hlvm/test/xml2xml/helloworld.hlx">
- <bundle name="helloworld">
- <const name="hw" type="text"><text>Hello, World
</text></const>
- <program name="helloworld">
- <var name="stdout" type="io"/>
- <store name="stdout">
- <open>hlvm:std:out</open>
- </store>
- <write>
- <ref name="stdout"/>
- <ref name="hw"/>
- <len><ref name="hw"/></len>
- </write>
- <close>
- <ref name="stdout"/>
- </close>
- <ret>
- <int>0</int>
- </ret>
+ <bundle id="helloworld">
+ <constant id="hw" type="text"><text>Hello, World
</text></constant>
+ <program id="helloworld">
+ <block>
+ <variable id="stdout" type="io"/>
+ <store>
+ <ref id="stdout"/>
+ <open><text>hlvm:std:out</text></open>
+ </store>
+ <write>
+ <load><ref id="stdout"/></load>
+ <load><ref id="hw"/></load>
+ <length><ref id="hw"/></length>
+ </write>
+ <close>
+ <load><ref id="stdout"/></load>
+ </close>
+ <ret>
+ <dec>0</dec>
+ </ret>
+ </block>
</program>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/return0/return0.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/return0/return0.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/return0/return0.hlx (original)
+++ hlvm/trunk/test/return0/return0.hlx Sat Jul 7 19:00:12 2007
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/xml2xml/return.hlx">
- <bundle name="return">
- <program name="return">
+ <bundle id="return">
+ <program id="return">
<block>
<ret>
- <dec>42</dec>
+ <dec>0</dec>
</ret>
</block>
</program>
Modified: hlvm/trunk/test/xml2xml/alias.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/alias.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/alias.hlx (original)
+++ hlvm/trunk/test/xml2xml/alias.hlx Sat Jul 7 19:00:12 2007
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <atom name="someType">
+ <bundle id="bundle">
+ <atom id="someType">
<intrinsic is="any"/>
</atom>
- <alias name="anAlias" renames="someType"/>
+ <alias id="anAlias" renames="someType"/>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/array.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/array.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/array.hlx (original)
+++ hlvm/trunk/test/xml2xml/array.hlx Sat Jul 7 19:00:12 2007
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <atom name="someType">
+ <bundle id="bundle">
+ <atom id="someType">
<intrinsic is="any"/>
</atom>
- <array name="anArray" of="someType" length="128"/>
+ <array id="anArray" of="someType" length="128"/>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/bundle.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/bundle.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/bundle.hlx (original)
+++ hlvm/trunk/test/xml2xml/bundle.hlx Sat Jul 7 19:00:12 2007
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="name"/>
+ <bundle id="name"/>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/doc.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/doc.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/doc.hlx (original)
+++ hlvm/trunk/test/xml2xml/doc.hlx Sat Jul 7 19:00:12 2007
@@ -1,130 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
+ <bundle id="bundle">
<doc><p>This is a documentation node for a bundle element</p></doc>
- <atom name="someType">
+ <atom id="someType">
<doc><p>Atom Doc</p></doc>
<intrinsic is="any"/>
</atom>
- <alias name="anAlias" renames="someType">
+ <alias id="anAlias" renames="someType">
<doc><p>Alias Doc</p></doc>
</alias>
- <array name="anArray" of="someType" length="128">
+ <array id="anArray" of="someType" length="128">
<doc><p>Array Doc</p></doc>
</array>
- <enumeration name="anEnumeration">
+ <enumeration id="anEnumeration">
<doc>This is anEnumeration</doc>
<enumerator id="one"/>
<enumerator id="two"/>
<enumerator id="three"/>
<enumerator id="four"/>
</enumeration>
- <atom name="1">
+ <atom id="1">
<doc>Any can hold anything. It provides the dynamic typing</doc>
<intrinsic is="any"/>
</atom>
- <atom name="2">
+ <atom id="2">
<doc>Obviously this is a boolean</doc>
<intrinsic is="bool"/>
</atom>
- <atom name="3">
+ <atom id="3">
<doc>UTF-16 character</doc>
<intrinsic is="char"/>
</atom>
- <atom name="4">
+ <atom id="4">
<doc>IEEE Quad Floating Point (128 bits)</doc>
<intrinsic is="f128"/>
</atom>
- <atom name="5">
+ <atom id="5">
<doc>IEEE Extended Double Floating Point (80 bits)</doc>
<intrinsic is="f80"/>
</atom>
- <atom name="6">
+ <atom id="6">
<doc>IEEE Double Floating Point (64 bits)</doc>
<intrinsic is="f64"/>
</atom>
- <atom name="7">
+ <atom id="7">
<doc>IEEE Extended Single Floating Point (43 bits)</doc>
- <intrinsic is="f43"/>
+ <intrinsic is="f44"/>
</atom>
- <atom name="8">
+ <atom id="8">
<doc>IEEE Single Floating Point (32 bits)</doc>
<intrinsic is="f32"/>
</atom>
- <atom name="9">
+ <atom id="9">
<doc>Signed 128 bit integer</doc>
<intrinsic is="s128"/>
</atom>
- <atom name="10">
+ <atom id="10">
<doc>Signed 64 bit integer</doc>
<intrinsic is="s64"/>
</atom>
- <atom name="11">
+ <atom id="11">
<doc>Signed 32 bit integer</doc>
<intrinsic is="s32"/>
</atom>
- <atom name="12">
+ <atom id="12">
<doc>Signed 16 bit integer</doc>
<intrinsic is="s16"/>
</atom>
- <atom name="13">
+ <atom id="13">
<doc>Signed 8 bit integer</doc>
<intrinsic is="s8"/>
</atom>
- <atom name="14">
+ <atom id="14">
<doc>An 8-bit non-numerical quantity</doc>
<intrinsic is="octet"/>
</atom>
- <atom name="15">
+ <atom id="15">
<doc>Unsigned 128 bit integer</doc>
<intrinsic is="u128"/>
</atom>
- <atom name="16">
+ <atom id="16">
<doc>Unsigned 64 bit integer</doc>
<intrinsic is="u64"/>
</atom>
- <atom name="17">
+ <atom id="17">
<doc>Unsigned 32 bit integer</doc>
<intrinsic is="u32"/>
</atom>
- <atom name="18">
+ <atom id="18">
<doc>Unsigned 16 bit integer</doc>
<intrinsic is="u16"/>
</atom>
- <atom name="19">
+ <atom id="19">
<doc>Unsigned 8 bit integer</doc>
<intrinsic is="u8"/>
</atom>
- <atom name="20">
+ <atom id="20">
<doc>The void type, zero size</doc>
<intrinsic is="void"/>
</atom>
- <pointer name="aPointerType" to="someType">
+ <pointer id="aPointerType" to="someType">
<doc>A Pointer Type</doc>
</pointer>
- <signature name="struct2" result="someType" varargs="true">
+ <signature id="struct2" result="someType" varargs="true">
<doc>This is signature doc</doc>
- <arg name="arg1" type="someType">
+ <arg id="arg1" type="someType">
<doc>Doc for "arg1"</doc>
</arg>
- <arg name="arg2" type="someType">
+ <arg id="arg2" type="someType">
<doc><i>Doc for "arg2"</i></doc>
</arg>
</signature>
- <structure name="struct2">
+ <structure id="struct2">
<doc>This is structure doc</doc>
- <field name="field1" type="someType">
+ <field id="field1" type="someType">
<doc><p><i><b>Field 1 Documentation</b></i></p></doc>
</field>
- <field name="field2" type="someType">
+ <field id="field2" type="someType">
<doc>Documentation for field 2</doc>
</field>
</structure>
- <vector name="aVector" of="f32" length="128">
+ <vector id="aVector" of="f32" length="128">
<doc>Vector doc</doc>
</vector>
- <var name="var" type="int">
+ <variable id="var" type="int">
<doc><p>This is documentation for a <i>var</i>iable</p></doc>
- </var>
+ </variable>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/enumeration.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/enumeration.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/enumeration.hlx (original)
+++ hlvm/trunk/test/xml2xml/enumeration.hlx Sat Jul 7 19:00:12 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <enumeration name="anEnumeration">
+ <bundle id="bundle">
+ <enumeration id="anEnumeration">
<enumerator id="one"/>
<enumerator id="two"/>
<enumerator id="three"/>
Modified: hlvm/trunk/test/xml2xml/intrinsics.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/intrinsics.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/intrinsics.hlx (original)
+++ hlvm/trunk/test/xml2xml/intrinsics.hlx Sat Jul 7 19:00:12 2007
@@ -1,64 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <atom name="1">
+ <bundle id="bundle">
+ <atom id="1">
<intrinsic is="any"/>
</atom>
- <atom name="2">
+ <atom id="2">
<intrinsic is="bool"/>
</atom>
- <atom name="3">
+ <atom id="3">
<intrinsic is="char"/>
</atom>
- <atom name="4">
+ <atom id="4">
<intrinsic is="f128"/>
</atom>
- <atom name="5">
+ <atom id="5">
<intrinsic is="f80"/>
</atom>
- <atom name="6">
+ <atom id="6">
<intrinsic is="f64"/>
</atom>
- <atom name="7">
- <intrinsic is="f43"/>
+ <atom id="7">
+ <intrinsic is="f44"/>
</atom>
- <atom name="8">
+ <atom id="8">
<intrinsic is="f32"/>
</atom>
- <atom name="9">
+ <atom id="9">
<intrinsic is="s128"/>
</atom>
- <atom name="10">
+ <atom id="10">
<intrinsic is="s64"/>
</atom>
- <atom name="11">
+ <atom id="11">
<intrinsic is="s32"/>
</atom>
- <atom name="12">
+ <atom id="12">
<intrinsic is="s16"/>
</atom>
- <atom name="13">
+ <atom id="13">
<intrinsic is="s8"/>
</atom>
- <atom name="14">
+ <atom id="14">
<intrinsic is="octet"/>
</atom>
- <atom name="15">
+ <atom id="15">
<intrinsic is="u128"/>
</atom>
- <atom name="16">
+ <atom id="16">
<intrinsic is="u64"/>
</atom>
- <atom name="17">
+ <atom id="17">
<intrinsic is="u32"/>
</atom>
- <atom name="18">
+ <atom id="18">
<intrinsic is="u16"/>
</atom>
- <atom name="19">
+ <atom id="19">
<intrinsic is="u8"/>
</atom>
- <atom name="20">
+ <atom id="20">
<intrinsic is="void"/>
</atom>
</bundle>
Modified: hlvm/trunk/test/xml2xml/pointer.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/pointer.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/pointer.hlx (original)
+++ hlvm/trunk/test/xml2xml/pointer.hlx Sat Jul 7 19:00:12 2007
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <atom name="someType">
+ <bundle id="bundle">
+ <atom id="someType">
<intrinsic is="any"/>
</atom>
- <pointer name="aPointerType" to="someType"/>
+ <pointer id="aPointerType" to="someType"/>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/resolve.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/resolve.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/resolve.hlx (original)
+++ hlvm/trunk/test/xml2xml/resolve.hlx Sat Jul 7 19:00:12 2007
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <structure name="struct1">
- <field name="field1" type="SomeType"/>
+ <bundle id="bundle">
+ <structure id="struct1">
+ <field id="field1" type="SomeType"/>
</structure>
- <structure name="struct2">
- <field name="field1" type="SomeType"/>
- <field name="field2" type="PtrToSomeType"/>
+ <structure id="struct2">
+ <field id="field1" type="SomeType"/>
+ <field id="field2" type="PtrToSomeType"/>
</structure>
- <pointer name="PtrToSomeType" to="SomeType"/>
- <atom name="SomeType">
+ <pointer id="PtrToSomeType" to="SomeType"/>
+ <atom id="SomeType">
<intrinsic is="any"/>
</atom>
</bundle>
Modified: hlvm/trunk/test/xml2xml/return.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/return.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/return.hlx (original)
+++ hlvm/trunk/test/xml2xml/return.hlx Sat Jul 7 19:00:12 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="http://hlvm.org/src/hlvm/test/xml2xml/return.hlx">
- <bundle name="return">
- <program name="return">
+ <bundle id="return">
+ <program id="return">
<block>
<ret>
<dec>42</dec>
Modified: hlvm/trunk/test/xml2xml/signature.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/signature.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/signature.hlx (original)
+++ hlvm/trunk/test/xml2xml/signature.hlx Sat Jul 7 19:00:12 2007
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <atom name="someType">
+ <bundle id="bundle">
+ <atom id="someType">
<intrinsic is="any"/>
</atom>
- <signature name="sig1" result="someType" varargs="false">
- <arg name="arg1" type="someType"/>
+ <signature id="sig1" result="someType" varargs="false">
+ <arg id="arg1" type="someType"/>
</signature>
- <signature name="struct2" result="someType" varargs="true">
- <arg name="arg1" type="someType"/>
- <arg name="arg1" type="someType"/>
+ <signature id="struct2" result="someType" varargs="true">
+ <arg id="arg1" type="someType"/>
+ <arg id="arg1" type="someType"/>
</signature>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/structure.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/structure.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/structure.hlx (original)
+++ hlvm/trunk/test/xml2xml/structure.hlx Sat Jul 7 19:00:12 2007
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <atom name="someType">
+ <bundle id="bundle">
+ <atom id="someType">
<intrinsic is="any"/>
</atom>
- <structure name="struct1">
- <field name="field1" type="someType"/>
+ <structure id="struct1">
+ <field id="field1" type="someType"/>
</structure>
- <structure name="struct2">
- <field name="field1" type="someType"/>
- <field name="field2" type="someType"/>
+ <structure id="struct2">
+ <field id="field1" type="someType"/>
+ <field id="field2" type="someType"/>
</structure>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/var.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/var.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/var.hlx (original)
+++ hlvm/trunk/test/xml2xml/var.hlx Sat Jul 7 19:00:12 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <var name="var" type="int"/>
+ <bundle id="bundle">
+ <variable id="var" type="int"/>
</bundle>
</hlvm>
Modified: hlvm/trunk/test/xml2xml/vector.hlx
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/xml2xml/vector.hlx?rev=38138&r1=38137&r2=38138&view=diff
==============================================================================
--- hlvm/trunk/test/xml2xml/vector.hlx (original)
+++ hlvm/trunk/test/xml2xml/vector.hlx Sat Jul 7 19:00:12 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<hlvm xmlns="http://hlvm.org/src/hlvm/Reader/XML/HLVM.rng" pubid="name">
- <bundle name="bundle">
- <vector name="aVector" of="f32" length="128"/>
+ <bundle id="bundle">
+ <vector id="aVector" of="f32" length="128"/>
</bundle>
</hlvm>
More information about the llvm-commits
mailing list