Fix for "--" comment and no trailing newline, as seen in Perl.

bmomjian · bmomjian · commit fbe9d1a43045 · 1999-10-08T05:03:14.000Z
diff --git 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.57 1999/09/28 03:41:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.58 1999/10/08 05:03:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -167,7 +167,7 @@ real				(((({digit}*\.{digit}+)|({digit}+\.{digit}*))([Ee][-+]?{digit}+)?)|({dig
 
 param			\${integer}
 
-comment			("--"|"//").*\n
+comment			("--"|"//").*
 
 space			[ \t\n\f]
 other			.
diff --git a/src/interfaces/perl5/test.pl b/src/interfaces/perl5/test.pl
@@ -1,6 +1,6 @@
 #!/usr/local/bin/perl -w
 
-# $Id: test.pl,v 1.9 1998/09/27 19:12:26 mergl Exp $
+# $Id: test.pl,v 1.10 1999/10/08 05:03:14 momjian Exp $
 
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl test.pl'
@@ -147,7 +147,7 @@
 
 ######################### create and insert into table
 
-$result = $conn->exec("CREATE TABLE person (id int4, name char(16))");
+$result = $conn->exec("CREATE TABLE person (id int4, name char(16)) -- test");
 die $conn->errorMessage unless PGRES_COMMAND_OK eq $result->resultStatus;
 my $cmd = $result->cmdStatus;
 ( "CREATE" eq $cmd )

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.57 1999/09/28 03:41:36 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.58 1999/10/08 05:03:13 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -167,7 +167,7 @@ real (((({digit}\.{digit}+)\|({digit}+\.{digit}))([Ee][-+]?{digit}+)?)\|({dig`
`167`	`167`
`168`	`168`	`param \${integer}`
`169`	`169`
`170`		`-comment ("--"\|"//").*\n`
	`170`	`+comment ("--"\|"//").*`
`171`	`171`
`172`	`172`	`space [ \t\n\f]`
`173`	`173`	`other .`