Mercurial > hg-old > index.cgi

changeset 407:b2e007c28b8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed ENDS to be ENDSTRUCT instead of ENDSECTION since ENDSTRUCT is required but ENDSECTION is not; updated docs to reflect change
author lost@l-w.ca
date Fri, 23 Jul 2010 19:53:43 -0600
parents 502fbc37ff4e
children 2a94b2e64621
files doc/manual.docbook.sgml lwasm/instab.c
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/doc/manual.docbook.sgml	Fri Jul 23 19:23:17 2010 -0600
+++ b/doc/manual.docbook.sgml	Fri Jul 23 19:53:43 2010 -0600
@@ -1136,9 +1136,12 @@
 </varlistentry>
 <varlistentry>
 <term>ENDSTRUCT</term>
+<term>ENDS</term>
 <listitem>
 <para>
-This directive ends the definition of the structure.
+This directive ends the definition of the structure. ENDSTRUCT is the
+preferred form. Prior to version 3.0 of LWASM, ENDS was used to end a
+section instead of a structure.
 </para>
 </listitem>
 </varlistentry>
@@ -1315,11 +1318,12 @@
 <varlistentry>
 <term>ENDSECTION</term>
 <term>ENDSECT</term>
-<term>ENDS</term>
 <listitem>
 <para>
 This directive ends the current section. This puts assembly outside of any
-sections until the next SECTION directive.
+sections until the next SECTION directive. ENDSECTION is the preferred form.
+Prior to version 3.0 of LWASM, ENDS could also be used to end a section but
+as of version 3.0, it is now an alias for ENDSTRUCT instead.
 </listitem>
 </varlistentry>
 
--- a/lwasm/instab.c	Fri Jul 23 19:23:17 2010 -0600
+++ b/lwasm/instab.c	Fri Jul 23 19:53:43 2010 -0600
@@ -619,11 +619,11 @@
 
 	{ "section",	{	-1, 	-1, 	-1, 	-1},	pseudo_parse_section,	pseudo_resolve_section,			pseudo_emit_section,		lwasm_insn_normal},
 	{ "sect",		{	-1, 	-1, 	-1, 	-1},	pseudo_parse_section,	pseudo_resolve_section,			pseudo_emit_section,		lwasm_insn_normal},
-	{ "ends",		{	-1, 	-1, 	-1, 	-1},	pseudo_parse_endsection,pseudo_resolve_endsection,		pseudo_emit_endsection,		lwasm_insn_normal},
 	{ "endsect",	{	-1, 	-1, 	-1, 	-1},	pseudo_parse_endsection,pseudo_resolve_endsection,		pseudo_emit_endsection,		lwasm_insn_normal},
 	{ "endsection",	{	-1,		-1, 	-1, 	-1},	pseudo_parse_endsection,pseudo_resolve_endsection,		pseudo_emit_endsection,		lwasm_insn_normal},
 
 	{ "struct",		{	-1,		-1,		-1,		-1},	pseudo_parse_struct,	pseudo_resolve_struct,			pseudo_emit_struct,			lwasm_insn_normal},
+	{ "ends",		{	-1, 	-1, 	-1, 	-1},	pseudo_parse_endstruct,	pseudo_resolve_endstruct,		pseudo_emit_endstruct,		lwasm_insn_struct},
 	{ "endstruct",	{	-1,		-1,		-1,		-1},	pseudo_parse_endstruct,	pseudo_resolve_endstruct,		pseudo_emit_endstruct,		lwasm_insn_struct},