Subversion Repositories NedoOS

    ;; classic syntax (name is after MACRO directive)
    MACRO   classicNameNoArg
        dz  "classic-no-arg\n"
    ENDM
    MACRO   classicNameOneArg arg1?
        db  "classic-1-arg: ", arg1?, "\n", 0
    ENDM
    MACRO   classicNameTwoArg arg1?, arg2?
        db  "classic-2-arg: ", arg1?, arg2?, "\n", 0
    ENDM

    ;; new optional syntax (label on MACRO line is used as macro name)
newNameNoArg    MACRO
                    dz  "new-no-arg\n"
                ENDM
newNameOneArg   MACRO  arg1?
                    db  "new-1-arg: ", arg1?, "\n", 0
                ENDM
newNameTwoArg   MACRO  arg1?, arg2?
                    db  "new-1-arg: ", arg1?, arg2?, "\n", 0
                ENDM

    ;; but label doesn't work over colon separator
Label       :   MACRO nameOrArg?
                    dz  "name-or-arg as name\n"
                ENDM

    ;; DEFL labels also don't work, even without colon
Babel = 2       MACRO nameOrArg2?
;                     dz  "name-or-arg2 as name\n"
                ENDM

    MODULE module1  ; first version did use "module1" as part of macro name - now fixed+tested

newInModule     MACRO arg1?
                    db "in-module-new-1-arg: ", arg1?, "\n", 0
                ENDM

                MACRO classicInModule arg1?
                    db "in-module-classic-1-arg: ", arg1?, "\n", 0
                ENDM

    ENDMODULE

    OUTPUT "label_as_name.bin"      ; verify defined macros (by checking bin output)
    classicNameNoArg : classicNameOneArg 'a' : classicNameTwoArg 'b', 'c'
    newNameNoArg : newNameOneArg 'a' : newNameTwoArg 'b', 'c'
    nameOrArg? : nameOrArg2?
    newInModule 'm' : classicInModule 'M'

    ;; invalid macro names
                MACRO @invalidClassic   ; no need for "ENDM" due to error
@invalidNew     MACRO

                MACRO #invalidClassic2 arg1?    ; no need for "ENDM" due to error
#invalidNew2    MACRO arg1?

trailingChar$   MACRO arg1

                MACRO trailingChar$ arg1