From 56ce1c75ccd89b8b78b30f2035b60eb1bb9426e2 Mon Sep 17 00:00:00 2001 From: "John M. Penn" Date: Thu, 30 Mar 2017 16:14:28 -0500 Subject: [PATCH] Fix yyset_out, yyset_lineno calls and remove yyset_in calls in parsers. Ref #404 --- trick_source/sim_services/CheckPointAgent/input_parser.l | 4 ++-- trick_source/sim_services/MemoryManager/adef_parser.l | 7 ++----- trick_source/sim_services/MemoryManager/ref_parser.l | 7 ++----- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/trick_source/sim_services/CheckPointAgent/input_parser.l b/trick_source/sim_services/CheckPointAgent/input_parser.l index 76fbbc40..a7dc0520 100644 --- a/trick_source/sim_services/CheckPointAgent/input_parser.l +++ b/trick_source/sim_services/CheckPointAgent/input_parser.l @@ -560,9 +560,9 @@ void ChkPtParseContext::init_scanner() { yylex_init( &scanner); // Set the file where output messages are to go. - yyset_out( stdout, &scanner); + yyset_out( stdout, scanner); - //yyset_lineno( 1, &scanner); + yyset_lineno( 1, scanner); yyset_extra( this, scanner); } diff --git a/trick_source/sim_services/MemoryManager/adef_parser.l b/trick_source/sim_services/MemoryManager/adef_parser.l index 8280ec19..6c32c362 100644 --- a/trick_source/sim_services/MemoryManager/adef_parser.l +++ b/trick_source/sim_services/MemoryManager/adef_parser.l @@ -270,13 +270,10 @@ void Trick::ADefParseContext::init_scanner() { // Allocate the scanner structure. yylex_init( &scanner); - // Set the file to be parsed. - //yyset_in( fp_in, &scanner); - // Set the file where output messages are to go. - yyset_out( stdout, &scanner); + yyset_out( stdout, scanner); - //yyset_lineno( 1, &scanner); + yyset_lineno( 1, scanner ); yyset_extra( this, scanner); diff --git a/trick_source/sim_services/MemoryManager/ref_parser.l b/trick_source/sim_services/MemoryManager/ref_parser.l index 1a072f99..8c4153f1 100644 --- a/trick_source/sim_services/MemoryManager/ref_parser.l +++ b/trick_source/sim_services/MemoryManager/ref_parser.l @@ -135,13 +135,10 @@ void RefParseContext::init_scanner() { // Allocate the scanner structure. yylex_init( &scanner); - // Set the file to be parsed. - //yyset_in( fp_in, &scanner); - // Set the file where output messages are to go. - yyset_out( stdout, &scanner); + yyset_out( stdout, scanner); - //yyset_lineno( 1, &scanner); + yyset_lineno( 1, scanner); yyset_extra( this, scanner);