Fix substitution to really check for the right does-code

Author: forthy42

engine/main.c

@@ -2358,7 +2358,7 @@ int gforth_args(int argc, char ** argv, char ** path, char ** imagename)
     case 'x': debug = 1; break;
     case 'D': print_diag(); break;
     case 'v': fputs(PACKAGE_STRING" "ARCH"\n", stderr); return 1;
-    case opt_code_block_size: code_area_size = atoi(optarg); break;
+    case opt_code_block_size: if((code_area_size = convsize(optarg,sizeof(Char)))==-1L) return 1; break;
     case ss_number: static_super_number = atoi(optarg); break;
     case ss_states: maxstates = max(min(atoi(optarg),MAX_STATE),1); break;
 #ifndef NO_DYNAMIC

substitute.fs

@@ -4,14 +4,15 @@ require string.fs
 
 wordlist AConstant macros-wordlist
 
-: macro: ( addr u -- ) Create here 0 , $! DOES> $@ ;
+: macro: ( addr u -- ) Create here 0 , $! DOES> [ here >r ] $@ ; r>
+Constant macro-does:
 
 : replaces ( addr1 len1 addr2 len2 -- )
     \G create a macro with name @var{addr2 len2} and content @var{addr1 len1}.
     \G if the macro already exists, just change the content.
     2dup macros-wordlist search-wordlist
     IF
-	nip nip dup @ dodoes: = IF  >body $!
+	nip nip dup >does-code macro-does: = IF  >body $!
 	ELSE  true [: .name ." is a hard-coded macro" cr ;] ?warning  2drop
 	THEN
     ELSE