# HG changeset patch # User lost@l-w.ca # Date 1279936423 21600 # Node ID b2e007c28b8f7c9e7aa1ad94fa252a8f08cb1ecc # Parent 502fbc37ff4edfc0b4c64383fc0ac98d85394f1e Changed ENDS to be ENDSTRUCT instead of ENDSECTION since ENDSTRUCT is required but ENDSECTION is not; updated docs to reflect change diff -r 502fbc37ff4e -r b2e007c28b8f doc/manual.docbook.sgml --- 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 @@ ENDSTRUCT +ENDS -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. @@ -1315,11 +1318,12 @@ ENDSECTION ENDSECT -ENDS 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. diff -r 502fbc37ff4e -r b2e007c28b8f lwasm/instab.c --- 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},