diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/parser/scan.l | 4 | ||||
| -rw-r--r-- | src/backend/utils/sort/psort.c | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index d29db6084f2..bc043f630bd 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.16 1997/09/02 02:32:35 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.17 1997/09/05 00:09:20 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -120,6 +120,7 @@ real -?{digit}+\.{digit}+([Ee][-+]?{digit}+)? param \${integer} comment "--".*\n +comment2 "//".*\n space [ \t\n\f] other . @@ -131,6 +132,7 @@ other . } {comment} { /* ignore */ } +{comment2} { /* ignore */ } {xcline} { /* ignore */ } diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c index d7829401810..12486166268 100644 --- a/src/backend/utils/sort/psort.c +++ b/src/backend/utils/sort/psort.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.17 1997/08/19 21:36:06 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.18 1997/09/05 00:09:23 momjian Exp $ * * NOTES * Sorts the first relation into the second relation. @@ -90,21 +90,21 @@ static long shortzero = 0; /* used to delimit runs */ * * LeftistContextData treeContext; * - * static int TapeRange; // number of tapes - 1 (T) // - * static int Level; // (l) // - * static int TotalDummy; // summation of tp_dummy // + * static int TapeRange; number of tapes - 1 (T) + * static int Level; (l) + * static int TotalDummy; summation of tp_dummy * static struct tape *Tape; * - * static int BytesRead; // to keep track of # of IO // + * static int BytesRead; to keep track of # of IO * static int BytesWritten; * - * struct leftist *Tuples; // current tuples in memory // + * struct leftist *Tuples; current tuples in memory * - * FILE *psort_grab_file; // this holds tuples grabbed - * from merged sort runs // - * long psort_current; // current file position // - * long psort_saved; // file position saved for - * mark and restore // + * FILE *psort_grab_file; this holds tuples grabbed + * from merged sort runs + * long psort_current; current file position + * long psort_saved; file position saved for + * mark and restore */ /* |