Skip to content

Commit

Permalink
chore: data is fields
Browse files Browse the repository at this point in the history
  • Loading branch information
@vinniefalco
vinniefalco committed Jun 21, 2023
1 parent a07082a commit 9744bf6
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 57 deletions.
0 ...generator/asciidoc/partials/data.adoc.hbs → ...enerator/asciidoc/partials/field.adoc.hbs
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions addons/generator/asciidoc/partials/tranche.adoc.hbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@
{{>info-list tranche.types}}
{{/if}}
{{#if tranche.functions}}
==={{label}} Functions
==={{label}} Member Functions
{{>info-list tranche.functions}}
{{/if}}
{{#if tranche.enums}}
==={{label}} Enums
{{>info-list tranche.enums}}
{{/if}}
{{#if tranche.data}}
==={{label}} Data
{{>info-list tranche.data}}
{{#if tranche.fields}}
==={{label}} Data Members
{{>info-list tranche.fields}}
{{/if}}
{{#if tranche.staticfunctions}}
==={{label}} Static Functions
==={{label}} Static Member Functions
{{>info-list tranche.staticfunctions}}
{{/if}}
{{#if tranche.staticdata}}
==={{label}} Static Data
==={{label}} Static Data Members
{{>info-list tranche.staticdata}}
{{/if}}
2 changes: 1 addition & 1 deletion mrdox.rnc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ grammar
#---------------------------------------------

Field =
element data
element field
{
Name,
Access ?,
Expand Down
2 changes: 1 addition & 1 deletion source/-XML/CXXTags.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ constexpr llvm::StringRef aliasTagName = "alias";
constexpr llvm::StringRef attributeTagName = "attr";
constexpr llvm::StringRef baseTagName = "base";
constexpr llvm::StringRef classTagName = "class";
constexpr llvm::StringRef dataMemberTagName = "data";
constexpr llvm::StringRef dataMemberTagName = "field";
constexpr llvm::StringRef javadocTagName = "doc";
constexpr llvm::StringRef enumTagName = "enum";
constexpr llvm::StringRef friendTagName = "friend";
Expand Down
4 changes: 2 additions & 2 deletions source/Dom/DomInterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class DomTranche : public dom::Object
DomTrancheList<TypedefInfo,
DomSymbol<TypedefInfo>>>(
I_, tranche_.Types, corpus_);
if(key == "data")
if(key == "field")
return dom::create<
DomTrancheList<FieldInfo,
DomSymbol<FieldInfo>>>(
Expand All @@ -120,7 +120,7 @@ class DomTranche : public dom::Object
"functions",
"enums",
"types",
"data",
"fields",
"staticfuncs",
"staticdata"
};
Expand Down
2 changes: 1 addition & 1 deletion source/Metadata/Info.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ toString(InfoKind kind) noexcept
case InfoKind::Record:
return "record";
case InfoKind::Field:
return "data";
return "field";
case InfoKind::Function:
return "function";
case InfoKind::Enum:
Expand Down
56 changes: 28 additions & 28 deletions test-files/old-tests/class-template.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,80 +9,80 @@
<tparam name="T" class="type"/>
<struct name="C0" id="sv7ww7qclY8KsvAbFHXaKZnSO80=">
<file path="class-template.cpp" line="4" class="def"/>
<data name="w" id="ySFHEWJe6/b1dbtjDC2IAvT2vmU=">
<field name="w" id="ySFHEWJe6/b1dbtjDC2IAvT2vmU=">
<file path="class-template.cpp" line="6" class="def"/>
<type name="int"/>
</data>
<data name="x" id="81imwKxfuTfd7lfVGnF+fKx46lY=">
</field>
<field name="x" id="81imwKxfuTfd7lfVGnF+fKx46lY=">
<file path="class-template.cpp" line="7" class="def"/>
<type name="S" id="pOYGF6pLJlICuiGO0Xj0daDb/to="/>
</data>
<data name="y" id="UKBRhwzQ0PeL6ZwfxmreRBoDQSY=">
</field>
<field name="y" id="UKBRhwzQ0PeL6ZwfxmreRBoDQSY=">
<file path="class-template.cpp" line="8" class="def"/>
<type name="T"/>
</data>
</field>
<struct name="N0" id="gx6LdMT9nBMQKB26lZXGWbB7N6c=">
<file path="class-template.cpp" line="10" class="def"/>
<data name="z" id="sdv932bFyf1dJzPblqxQGqsy8G4=">
<field name="z" id="sdv932bFyf1dJzPblqxQGqsy8G4=">
<file path="class-template.cpp" line="12" class="def"/>
<type name="int"/>
</data>
</field>
</struct>
</struct>
</template>
<struct name="C1" id="tm2khHa6qZM0lj1f7IwBdxVxDgE=">
<file path="class-template.cpp" line="16" class="def"/>
<data name="w" id="Q0itZUB0O9hts+pFPk9DO415Lo8=">
<field name="w" id="Q0itZUB0O9hts+pFPk9DO415Lo8=">
<file path="class-template.cpp" line="18" class="def"/>
<type name="int"/>
</data>
</field>
<template>
<tparam name="T" class="type"/>
<struct name="N1" id="F1Cyqn/faLYbjTU4RfGsepUiiZw=">
<file path="class-template.cpp" line="21" class="def"/>
<data name="x" id="bQCgblScrSKOxQMVJxT7vFw9W4I=">
<field name="x" id="bQCgblScrSKOxQMVJxT7vFw9W4I=">
<file path="class-template.cpp" line="23" class="def"/>
<type name="S" id="pOYGF6pLJlICuiGO0Xj0daDb/to="/>
</data>
<data name="y" id="phg6+zMhjV0SJ7vav871OGqoPPQ=">
</field>
<field name="y" id="phg6+zMhjV0SJ7vav871OGqoPPQ=">
<file path="class-template.cpp" line="24" class="def"/>
<type name="T"/>
</data>
<data name="z" id="53ijFg2EUlLuOP8qvufgjwZDNoI=">
</field>
<field name="z" id="53ijFg2EUlLuOP8qvufgjwZDNoI=">
<file path="class-template.cpp" line="25" class="def"/>
<type name="int"/>
</data>
</field>
</struct>
</template>
</struct>
<template>
<tparam name="T" class="type"/>
<struct name="C2" id="IIPz8Fm6nqKoYQpeJ/kvZaWvtI8=">
<file path="class-template.cpp" line="30" class="def"/>
<data name="v" id="rvAO5HvzEvS8z9PgbRoqkyTi+1c=">
<field name="v" id="rvAO5HvzEvS8z9PgbRoqkyTi+1c=">
<file path="class-template.cpp" line="32" class="def"/>
<type name="int"/>
</data>
</field>
<template>
<tparam name="U" class="type"/>
<struct name="N2" id="xljI5oOqNOhyyR4QzmKvFB3nEfw=">
<file path="class-template.cpp" line="35" class="def"/>
<data name="w" id="bLX5mthqXMHAtLNEc87RKLQSUyU=">
<field name="w" id="bLX5mthqXMHAtLNEc87RKLQSUyU=">
<file path="class-template.cpp" line="37" class="def"/>
<type name="S" id="pOYGF6pLJlICuiGO0Xj0daDb/to="/>
</data>
<data name="x" id="qSNOAAxaet7aBxvD7WvFqJOpm3A=">
</field>
<field name="x" id="qSNOAAxaet7aBxvD7WvFqJOpm3A=">
<file path="class-template.cpp" line="38" class="def"/>
<type name="T"/>
</data>
<data name="y" id="P9x8qHxDv7huDL0MyNORJ/enU0Q=">
</field>
<field name="y" id="P9x8qHxDv7huDL0MyNORJ/enU0Q=">
<file path="class-template.cpp" line="39" class="def"/>
<type name="U"/>
</data>
<data name="z" id="pRO2j7I5aEQI+ktDwT1fLJPqy28=">
</field>
<field name="z" id="pRO2j7I5aEQI+ktDwT1fLJPqy28=">
<file path="class-template.cpp" line="40" class="def"/>
<type name="int"/>
</data>
</field>
</struct>
</template>
</struct>
Expand All @@ -92,10 +92,10 @@
<struct name="C3" id="x60FzYL65XgZZRrxrZuC5jemrwQ=">
<file path="class-template.cpp" line="48" class="def"/>
<file path="class-template.cpp" line="45"/>
<data name="v" id="28J+g16kE2M7qwnrP4yzW4hHlIg=">
<field name="v" id="28J+g16kE2M7qwnrP4yzW4hHlIg=">
<file path="class-template.cpp" line="50" class="def"/>
<type name="int"/>
</data>
</field>
</struct>
</template>
</namespace>
Expand Down
8 changes: 4 additions & 4 deletions test-files/old-tests/no_unique_address.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
</struct>
<struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
<file path="no_unique_address.cpp" line="5" class="def"/>
<data name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
<field name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
<file path="no_unique_address.cpp" line="7" class="def"/>
<type name="int"/>
</data>
<data name="e" id="h2j8f921HD+Fyaokcs4ndGM/yNk=">
</field>
<field name="e" id="h2j8f921HD+Fyaokcs4ndGM/yNk=">
<file path="no_unique_address.cpp" line="8" class="def"/>
<attr id="nodiscard"/>
<attr id="deprecated"/>
<type name="Empty" id="iczIHP1J59EwYw3xxL3w2C3Q43Q="/>
</data>
</field>
</struct>
</namespace>
</mrdox>
28 changes: 14 additions & 14 deletions test-files/old-tests/record-data.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,43 @@
<namespace name="">
<struct name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ=">
<file path="record-data.cpp" line="3" class="def"/>
<data name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
<field name="i" id="91xV6rCFObgi6i1/U2uZ/GnD3WM=">
<file path="record-data.cpp" line="5" class="def"/>
<type name="int"/>
</data>
<data name="j" id="g7xcHrg43mq7PlaOEmNvMHlU+Hk=">
</field>
<field name="j" id="g7xcHrg43mq7PlaOEmNvMHlU+Hk=">
<file path="record-data.cpp" line="6" class="def"/>
<type name="double"/>
</data>
</field>
</struct>
<struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
<file path="record-data.cpp" line="9" class="def"/>
<data name="t" id="LvEIBVXJYQQL4yraOaQv7ijMDng=">
<field name="t" id="LvEIBVXJYQQL4yraOaQv7ijMDng=">
<file path="record-data.cpp" line="11" class="def"/>
<type name="T" id="CgGNdHpW5mG/i5741WPYQDw28OQ="/>
</data>
</field>
</struct>
<class name="V" id="9kzYwt0WPztMEDUaFxul1Jvqqs8=">
<file path="record-data.cpp" line="14" class="def"/>
<data name="i" access="private" id="EWXCzRl9erjnMQFZ8VmHC5cVkLM=">
<field name="i" access="private" id="EWXCzRl9erjnMQFZ8VmHC5cVkLM=">
<file path="record-data.cpp" line="16" class="def"/>
<type name="int"/>
</data>
<data name="j" access="protected" id="VKvx+Pci4bUmtjCsXJqKb7SNYqw=">
</field>
<field name="j" access="protected" id="VKvx+Pci4bUmtjCsXJqKb7SNYqw=">
<file path="record-data.cpp" line="18" class="def"/>
<type name="unsigned long"/>
</data>
<data name="k" access="private" id="iKr1oLycejUWY6AnSgoQnbmaCEE=">
</field>
<field name="k" access="private" id="iKr1oLycejUWY6AnSgoQnbmaCEE=">
<file path="record-data.cpp" line="20" class="def"/>
<type name="double"/>
</data>
</field>
</class>
<struct name="W" id="6OhcFM3BV6KlrvmfpsljaMHxpdA=">
<file path="record-data.cpp" line="23" class="def"/>
<data name="buf" id="2akJUSKKPN7IylZjqGMRlhXupds=">
<field name="buf" id="2akJUSKKPN7IylZjqGMRlhXupds=">
<file path="record-data.cpp" line="25" class="def"/>
<type name="char[64]"/>
</data>
</field>
</struct>
</namespace>
</mrdox>

0 comments on commit 9744bf6

Please sign in to comment.