Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit868d708

Browse files
committed
Add // comments.
1 parentb45311e commit868d708

File tree

5 files changed

+36
-33
lines changed

5 files changed

+36
-33
lines changed

‎src/backend/parser/scan.l

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.16 1997/09/02 02:32:35 thomas Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.17 1997/09/05 00:09:20 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -120,6 +120,7 @@ real-?{digit}+\.{digit}+([Ee][-+]?{digit}+)?
120120
param\${integer}
121121

122122
comment"--".*\n
123+
comment2"//".*\n
123124

124125
space[\t\n\f]
125126
other.
@@ -131,6 +132,7 @@ other.
131132
}
132133

133134
{comment}{/* ignore */}
135+
{comment2}{/* ignore */}
134136

135137
{xcline}{/* ignore */ }
136138

‎src/backend/utils/sort/psort.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.17 1997/08/19 21:36:06 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.18 1997/09/05 00:09:23 momjian Exp $
1111
*
1212
* NOTES
1313
* Sorts the first relation into the second relation.
@@ -90,21 +90,21 @@ static longshortzero = 0;/* used to delimit runs */
9090
*
9191
* LeftistContextData treeContext;
9292
*
93-
* static int TapeRange;//number of tapes - 1 (T) //
94-
* static int Level;//(l) //
95-
* static int TotalDummy;//summation of tp_dummy //
93+
* static int TapeRange;number of tapes - 1 (T)
94+
* static int Level;(l)
95+
* static int TotalDummy;summation of tp_dummy
9696
* static struct tape *Tape;
9797
*
98-
* static intBytesRead;//to keep track of # of IO //
98+
* static intBytesRead;to keep track of # of IO
9999
* static intBytesWritten;
100100
*
101-
* struct leftist *Tuples;//current tuples in memory //
101+
* struct leftist *Tuples;current tuples in memory
102102
*
103-
* FILE *psort_grab_file;//this holds tuples grabbed
104-
* from merged sort runs //
105-
* long psort_current;//current file position //
106-
* long psort_saved;//file position saved for
107-
* mark and restore //
103+
* FILE *psort_grab_file; this holds tuples grabbed
104+
* from merged sort runs
105+
* long psort_current;current file position
106+
* long psort_saved;file position saved for
107+
* mark and restore
108108
*/
109109

110110
/*

‎src/bin/psql/psql.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.89 1997/09/01 06:09:53 thomas Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.90 1997/09/05 00:09:30 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1605,7 +1605,8 @@ MainLoop(PsqlSettings * settings, FILE * source)
16051605
continue;
16061606

16071607
/* single-line comment? truncate line */
1608-
}elseif (line[i]=='-'&&line[i+1]=='-') {
1608+
}elseif ((line[i]=='-'&&line[i+1]=='-')||
1609+
(line[i]=='/'&&line[i+1]=='/')) {
16091610
/* print comment at top of query */
16101611
if (settings->singleStep)
16111612
fprintf(stdout,"%s\n",line+i);

‎src/interfaces/libpq/fe-connect.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.37 1997/06/06 01:42:02 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.38 1997/09/05 00:09:43 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -423,14 +423,14 @@ connectDB(PGconn *conn)
423423
intportno;
424424

425425
/*
426-
//
427-
// Initialize the startup packet.
428-
//
429-
// This data structure is used for the seq-packet protocol. It
430-
// describes the frontend-backend connection.
431-
//
432-
//
433-
*/
426+
*
427+
* Initialize the startup packet.
428+
*
429+
* This data structure is used for the seq-packet protocol. It
430+
* describes the frontend-backend connection.
431+
*
432+
*
433+
*/
434434
strncpy(startup.user,conn->pguser,sizeof(startup.user));
435435
strncpy(startup.database,conn->dbName,sizeof(startup.database));
436436
strncpy(startup.tty,conn->pgtty,sizeof(startup.tty));
@@ -442,10 +442,10 @@ connectDB(PGconn *conn)
442442
startup.execFile[0]='\0';/* not used */
443443

444444
/*
445-
//
446-
// Open a connection to postmaster/backend.
447-
//
448-
*/
445+
*
446+
* Open a connection to postmaster/backend.
447+
*
448+
*/
449449
port= (Port*)malloc(sizeof(Port));
450450
memset((char*)port,0,sizeof(Port));
451451

‎src/interfaces/libpq/fe-exec.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.34 1997/08/2709:05:23 vadim Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.35 1997/09/05 00:09:47 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -436,11 +436,11 @@ process_response_from_backend(FILE *pfin, FILE *pfout, FILE *pfdebug,
436436
done= true;
437437
}else {
438438
/*
439-
// since backend may produce more than one result for some
440-
// commands need to poll until clear
441-
// send an empty query down, and keep reading out of the pipe
442-
// until an 'I' is received.
443-
*/
439+
* since backend may produce more than one result for some
440+
* commands need to poll until clear
441+
* send an empty query down, and keep reading out of the pipe
442+
* until an 'I' is received.
443+
*/
444444
pqPuts("Q ",pfout,pfdebug);/* send an empty query */
445445
/*
446446
* Increment a flag and process messages in the usual way because

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp