Fix GSTrans of quoted macro variable

    *BASIC
    *SetMacro Macro Test
    SYS "OS_GSTrans", """<Macro>""", &10000, &100

Would result in an erroneous "String not recognised" error as the
end of macro variable was reached before closing quote.
Fix by reordering the checks.

s/Arthur2

@@ -699,14 +699,16 @@ GSREAD_AngleBraDaftSoIsnt
         MOV     R1, #"<"
         B       GSREAD_ReturnWithChar   ; failed to get sensible variable
 
-GSREAD_XPandGotToEnd
+GSREAD_GotToEndCheckInString
         TST     R2, #GS_In_String       ; got CR or LF
         BNE     GSREAD_BadStringError   ; bad string
-        TST     R2, #GS_Macroing
 GSREAD_GotToAnEnd
-        ORREQ   lr, lr, #C_bit          ; got terminator
-        ExitSWIHandler EQ
+        ORR     lr, lr, #C_bit          ; got terminator
+        ExitSWIHandler
 
+GSREAD_XPandGotToEnd
+        TST     R2, #GS_Macroing
+        BEQ     GSREAD_GotToEndCheckInString
         ; Nest out by one level
         GSVarGetWSpace
         LDRB    R11, [R12, #GS_StackPtr]