* removed memavail

This commit is contained in:
peter 2004-11-22 17:52:19 +00:00
parent 295d18939a
commit 46d1fc9546
5 changed files with 75 additions and 132 deletions

View File

@ -44,15 +44,6 @@ interface
uses LexBase;
{$IFNDEF Win32}
var max_bytes : LongInt;
(* available memory *)
function n_bytes : LongInt;
(* memory actually used *)
{$ENDIF}
const
(* Maximum table sizes: *)
@ -206,13 +197,6 @@ implementation
uses LexMsgs;
{$IFNDEF Win32}
function n_bytes : LongInt;
begin
n_bytes := max_bytes-memAvail
end(*n_bytes*);
{$ENDIF}
(* Hash table routines: *)
function lookup(k : Integer) : String;
@ -466,10 +450,6 @@ begin
verbose := false;
optimize := false;
{$IFNDEF Win32}
max_bytes := memAvail;
{$ENDIF}
n_pos := 0;
n_states := 0;
n_trans := 0;

View File

@ -732,12 +732,6 @@ begin
if warnings>0 then writeln(warnings, ' warnings.');
{$ifndef fpc}
{$IFNDEF Win32}
writeln( n_bytes, '/', max_bytes, ' bytes of memory used.');
{$ENDIF}
{$endif}
(* terminate: *)
if errors>0 then erase(yyout);

View File

@ -36,7 +36,7 @@ Last changes:
updates)
$History: YACC.PAS $
*
*
* ***************** Version 2 *****************
* User: Berend Date: 96-10-10 Time: 21:16
* Updated in $/Lex and Yacc/tply
@ -175,28 +175,28 @@ begin
yyval := yyv[yysp-0];
end;
6 : begin
yyerrok;
yyerrok;
end;
7 : begin
yyerrok;
yyerrok;
end;
8 : begin
yyerrok;
yyerrok;
end;
9 : begin
yyerrok;
yyerrok;
end;
10 : begin
yyerrok;
yyerrok;
end;
11 : begin
yyerrok;
yyerrok;
end;
12 : begin
yyval := yyv[yysp-0];
end;
13 : begin
yyerrok;
yyerrok;
end;
14 : begin
yyval := yyv[yysp-0];
@ -205,19 +205,19 @@ begin
yyval := yyv[yysp-0];
end;
16 : begin
error(rcurl_expected);
error(rcurl_expected);
end;
17 : begin
yyval := yyv[yysp-0];
end;
18 : begin
yyerrok;
yyerrok;
end;
19 : begin
yyerrok;
yyerrok;
end;
20 : begin
yyerrok;
yyerrok;
end;
21 : begin
yyval := yyv[yysp-0];
@ -226,7 +226,7 @@ begin
yyval := yyv[yysp-0];
end;
23 : begin
error(rbrace_expected);
error(rbrace_expected);
end;
24 : begin
yyval := yyv[yysp-0];
@ -235,7 +235,7 @@ begin
yyval := yyv[yysp-0];
end;
26 : begin
error(rangle_expected);
error(rangle_expected);
end;
27 : begin
yyval := yyv[yysp-0];
@ -243,12 +243,12 @@ begin
28 : begin
sort_types;
definitions;
next_section;
next_section;
end;
29 : begin
next_section;
generate_parser;
next_section;
next_section;
end;
30 : begin
yyval := yyv[yysp-5];
@ -256,48 +256,48 @@ begin
31 : begin
end;
32 : begin
copy_rest_of_file;
copy_rest_of_file;
end;
33 : begin
end;
34 : begin
yyerrok;
yyerrok;
end;
35 : begin
error(error_in_def);
error(error_in_def);
end;
36 : begin
startnt := ntsym(yyv[yysp-0]);
startnt := ntsym(yyv[yysp-0]);
end;
37 : begin
error(ident_expected);
error(ident_expected);
end;
38 : begin
copy_code;
copy_code;
end;
39 : begin
yyval := yyv[yysp-2];
end;
40 : begin
act_prec := 0;
act_prec := 0;
end;
41 : begin
yyval := yyv[yysp-3];
end;
42 : begin
act_prec := new_prec_level(left);
act_prec := new_prec_level(left);
end;
43 : begin
yyval := yyv[yysp-3];
end;
44 : begin
act_prec := new_prec_level(right);
act_prec := new_prec_level(right);
end;
45 : begin
yyval := yyv[yysp-3];
end;
46 : begin
act_prec := new_prec_level(nonassoc);
act_prec := new_prec_level(nonassoc);
end;
47 : begin
yyval := yyv[yysp-3];
@ -309,169 +309,169 @@ begin
yyval := yyv[yysp-1];
end;
50 : begin
act_type := 0;
act_type := 0;
end;
51 : begin
act_type := yyv[yysp-1]; add_type(yyv[yysp-1]);
act_type := yyv[yysp-1]; add_type(yyv[yysp-1]);
end;
52 : begin
yyval := yyv[yysp-0];
end;
53 : begin
yyerrok;
yyerrok;
end;
54 : begin
yyerrok;
yyerrok;
end;
55 : begin
error(ident_expected);
error(ident_expected);
end;
56 : begin
error(error_in_def);
error(error_in_def);
end;
57 : begin
error(ident_expected);
error(ident_expected);
end;
58 : begin
if act_type<>0 then
sym_type^[yyv[yysp-0]] := act_type;
if act_prec<>0 then
sym_prec^[yyv[yysp-0]] := act_prec;
sym_prec^[yyv[yysp-0]] := act_prec;
end;
59 : begin
litsym(yyv[yysp-0], 0);
if act_type<>0 then
sym_type^[litsym(yyv[yysp-0], 0)] := act_type;
if act_prec<>0 then
sym_prec^[litsym(yyv[yysp-0], 0)] := act_prec;
sym_prec^[litsym(yyv[yysp-0], 0)] := act_prec;
end;
60 : begin
litsym(yyv[yysp-0], 0);
if act_type<>0 then
sym_type^[litsym(yyv[yysp-0], 0)] := act_type;
if act_prec<>0 then
sym_prec^[litsym(yyv[yysp-0], 0)] := act_prec;
sym_prec^[litsym(yyv[yysp-0], 0)] := act_prec;
end;
61 : begin
litsym(yyv[yysp-1], 0);
if act_type<>0 then
sym_type^[litsym(yyv[yysp-1], yyv[yysp-0])] := act_type;
if act_prec<>0 then
sym_prec^[litsym(yyv[yysp-1], 0)] := act_prec;
sym_prec^[litsym(yyv[yysp-1], 0)] := act_prec;
end;
62 : begin
litsym(yyv[yysp-1], 0);
if act_type<>0 then
sym_type^[litsym(yyv[yysp-1], yyv[yysp-0])] := act_type;
if act_prec<>0 then
sym_prec^[litsym(yyv[yysp-1], 0)] := act_prec;
sym_prec^[litsym(yyv[yysp-1], 0)] := act_prec;
end;
63 : begin
yyval := yyv[yysp-0];
end;
64 : begin
yyerrok;
yyerrok;
end;
65 : begin
yyerrok;
yyerrok;
end;
66 : begin
error(ident_expected);
error(ident_expected);
end;
67 : begin
error(error_in_def);
error(error_in_def);
end;
68 : begin
error(ident_expected);
error(ident_expected);
end;
69 : begin
if act_type<>0 then
sym_type^[ntsym(yyv[yysp-0])] := act_type;
sym_type^[ntsym(yyv[yysp-0])] := act_type;
end;
70 : begin
next_section;
next_section;
end;
71 : begin
yyval := yyv[yysp-1];
end;
72 : begin
copy_code;
copy_code;
end;
73 : begin
next_section;
next_section;
end;
74 : begin
yyval := yyv[yysp-4];
end;
75 : begin
yyerrok;
yyerrok;
end;
76 : begin
error(error_in_rule);
error(error_in_rule);
end;
77 : begin
error(error_in_rule);
error(error_in_rule);
end;
78 : begin
start_rule(ntsym(yyv[yysp-0]));
start_rule(ntsym(yyv[yysp-0]));
end;
79 : begin
start_body;
start_body;
end;
80 : begin
end_body;
end_body;
end;
81 : begin
yyval := yyv[yysp-0];
end;
82 : begin
start_body;
start_body;
end;
83 : begin
end_body;
end_body;
end;
84 : begin
end;
85 : begin
add_symbol(yyv[yysp-0]); yyerrok;
add_symbol(yyv[yysp-0]); yyerrok;
end;
86 : begin
add_symbol(sym(yyv[yysp-0])); yyerrok;
add_symbol(sym(yyv[yysp-0])); yyerrok;
end;
87 : begin
add_symbol(sym(yyv[yysp-0])); yyerrok;
add_symbol(sym(yyv[yysp-0])); yyerrok;
end;
88 : begin
add_action; yyerrok;
add_action; yyerrok;
end;
89 : begin
error(error_in_rule);
error(error_in_rule);
end;
90 : begin
copy_action;
copy_action;
end;
91 : begin
yyval := yyv[yysp-2];
end;
92 : begin
copy_single_action;
copy_single_action;
end;
93 : begin
end;
94 : begin
add_rule_prec(yyv[yysp-0]);
add_rule_prec(yyv[yysp-0]);
end;
95 : begin
yyval := yyv[yysp-3];
end;
96 : begin
add_rule_prec(litsym(yyv[yysp-0], 0));
add_rule_prec(litsym(yyv[yysp-0], 0));
end;
97 : begin
yyval := yyv[yysp-3];
end;
98 : begin
add_rule_prec(litsym(yyv[yysp-0], 0));
add_rule_prec(litsym(yyv[yysp-0], 0));
end;
99 : begin
yyval := yyv[yysp-3];
@ -482,7 +482,7 @@ begin
101 : begin
end;
102 : begin
add_action;
add_action;
end;
end;
end(*yyaction*);
@ -2145,10 +2145,10 @@ function yylex : integer;
('0'<=line[cno]) and (line[cno]<='9') or
(line[cno]='_') or
(line[cno]='.') ) do
begin
idstr := idstr+line[cno];
inc(cno)
end;
begin
idstr := idstr+line[cno];
inc(cno)
end;
yylval := get_key(idstr);
scan;
if not end_of_input and (line[cno]=':') then
@ -2366,9 +2366,9 @@ function yylex : integer;
else
case line[cno] of
'A'..'Z', 'a'..'z', '_' : yylex := scan_ident;
'''', '"' : yylex := scan_literal;
'0'..'9' : yylex := scan_num;
'%', '\' : yylex := scan_keyword;
'''', '"' : yylex := scan_literal;
'0'..'9' : yylex := scan_num;
'%', '\' : yylex := scan_keyword;
'=' :
if (cno<length(line)) and (line[succ(cno)]='{') then
begin
@ -2377,7 +2377,7 @@ function yylex : integer;
end
else
yylex := scan_char;
else yylex := scan_char;
else yylex := scan_char;
end;
if lno=lno0 then
tokleng := cno-cno0
@ -2512,12 +2512,6 @@ begin
if warnings>0 then writeln(warnings, ' warnings.');
{$ifndef fpc}
{$IFNDEF Win32}
writeln( n_bytes, '/', max_bytes, ' bytes of memory used.');
{$ENDIF}
{$endif}
(* terminate: *)
if errors>0 then
@ -2533,4 +2527,4 @@ begin
halt(errors);
end(*Yacc*).
end(*Yacc*).

View File

@ -848,12 +848,6 @@ begin
if warnings>0 then writeln(warnings, ' warnings.');
{$ifndef fpc}
{$IFNDEF Win32}
writeln( n_bytes, '/', max_bytes, ' bytes of memory used.');
{$ENDIF}
{$endif}
(* terminate: *)
if errors>0 then

View File

@ -48,14 +48,6 @@ uses
YaccBase;
{$IFNDEF Win32}
var max_bytes : LongInt;
(* available memory *)
function n_bytes : LongInt;
(* memory actually used *)
{$ENDIF}
const
(* Maximum table sizes: *)
@ -431,13 +423,6 @@ implementation
uses YaccMsgs;
{$IFNDEF Win32}
function n_bytes : LongInt;
begin
n_bytes := max_bytes-memAvail
end(*n_bytes*);
{$ENDIF}
(* Symbol table routines: *)
function new_nt : Integer;
@ -929,10 +914,6 @@ begin
debug := false;
startnt := 0;
{$IFNDEF Win32}
max_bytes := memAvail;
{$ENDIF}
n_nts := 1;
n_lits := 257;
n_rules := 0;