- removed unused scanner.tscannerstate, inserttext_begin and inserttext_end

    (leftovers from the initial symcreat implementations that didn't work)

git-svn-id: branches/jvmbackend@18637 -

compiler/pjvm.pas

@@ -67,7 +67,7 @@ implementation
         pd: tprocdef;
         topowner: tdefentry;
         i: longint;
-        sstate: symcreat.tscannerstate;
+        sstate: tscannerstate;
         needclassconstructor: boolean;
       begin
         { if there is at least one constructor for a class, do nothing (for
@@ -210,7 +210,7 @@ implementation
         i: longint;
         sym: tstaticvarsym;
         fsym: tfieldvarsym;
-        sstate: symcreat.tscannerstate;
+        sstate: tscannerstate;
         sl: tpropaccesslist;
       begin
         { if it's a subrange type, don't create a new class }
@@ -338,7 +338,7 @@ implementation
         ssym: tstaticvarsym;
         esym: tenumsym;
         i: longint;
-        sstate: symcreat.tscannerstate;
+        sstate: tscannerstate;
       begin
         case csym.constdef.typ of
           enumdef:

compiler/ptype.pas

@@ -1808,7 +1808,7 @@ implementation
 
     procedure add_typedconst_init_routine(def: tabstractrecorddef);
       var
-        sstate: symcreat.tscannerstate;
+        sstate: tscannerstate;
         pd: tprocdef;
       begin
         replace_scanner('tcinit_routine',sstate);

compiler/scanner.pas

@@ -78,13 +78,6 @@ interface
 
        tspecialgenerictoken = (ST_LOADSETTINGS,ST_LINE,ST_COLUMN,ST_FILEINDEX);
 
-       tscannerstate = record
-         lasttokenpos: longint;
-         current_tokenpos,
-         current_filepos: tfileposinfo;
-         token: ttoken;
-       end;
-
        { tscannerfile }
        tscannerfile = class
        private
@@ -153,10 +146,6 @@ interface
           procedure reload;
           { replaces current token with the text in p }
           procedure substitutemacro(const macname:string;p:pchar;len,line,fileindex:longint);
-          { inserts the text in p before the current token; the current token
-            will be restored afterwards }
-          procedure inserttext_begin(const macname: string; const str: ansistring; out scannerstate: tscannerstate);
-          procedure inserttext_end(const scannerstate: tscannerstate);
         { Scanner things }
           procedure gettokenpos;
           procedure inc_comment_level;
@@ -2465,35 +2454,6 @@ In case not, the value returned can be arbitrary.
       end;
 
 
-    procedure tscannerfile.inserttext_begin(const macname: string; const str: ansistring; out scannerstate: tscannerstate);
-      begin
-        if (nexttoken<>NOTOKEN) then
-          internalerror(2011032103);
-        scannerstate.lasttokenpos:=lasttokenpos;
-        scannerstate.token:=token;
-        scannerstate.current_tokenpos:=current_tokenpos;
-        scannerstate.current_filepos:=current_filepos;
-
-        current_scanner.substitutemacro(macname,@str[1],length(str),
-          current_scanner.line_no,current_scanner.inputfile.ref_index);
-        current_scanner.readtoken(false);
-      end;
-
-
-    procedure tscannerfile.inserttext_end(const scannerstate: tscannerstate);
-      begin
-        if nexttoken<>NOTOKEN then
-          internalerror(2011032104);
-        nexttoken:=token;
-        cachenexttokenpos;
-
-        lasttokenpos:=scannerstate.lasttokenpos;
-        token:=scannerstate.token;
-        current_tokenpos:=scannerstate.current_tokenpos;
-        current_filepos:=scannerstate.current_filepos;
-      end;
-
-
     procedure tscannerfile.do_gettokenpos(out tokenpos: longint; out filepos: tfileposinfo);
       begin
         tokenpos:=inputstart+(inputpointer-inputbuffer);