From: <ibr...@us...> - 2012-03-11 20:28:00
|
Revision: 4240 http://tora.svn.sourceforge.net/tora/?rev=4240&view=rev Author: ibre5041 Date: 2012-03-11 20:27:53 +0000 (Sun, 11 Mar 2012) Log Message: ----------- memory access fixes Modified Paths: -------------- branches/tora-trotl/sandbox.cpp/UserTraits.hpp branches/tora-trotl/sandbox.cpp/t1.cpp Modified: branches/tora-trotl/sandbox.cpp/UserTraits.hpp =================================================================== --- branches/tora-trotl/sandbox.cpp/UserTraits.hpp 2012-03-10 08:34:38 UTC (rev 4239) +++ branches/tora-trotl/sandbox.cpp/UserTraits.hpp 2012-03-11 20:27:53 UTC (rev 4240) @@ -65,7 +65,7 @@ // // || ((lt1.equals("full") || lt1.equals("left") || lt1.equals("right")) && (lt2.equals("outer") || lt2.equals("join")))) { // // return false; // // } - return false; + return true; } template<class StringType> Modified: branches/tora-trotl/sandbox.cpp/t1.cpp =================================================================== --- branches/tora-trotl/sandbox.cpp/t1.cpp 2012-03-10 08:34:38 UTC (rev 4239) +++ branches/tora-trotl/sandbox.cpp/t1.cpp 2012-03-11 20:27:53 UTC (rev 4240) @@ -137,13 +137,13 @@ // This is a local file, if it is a .java file, then // let's parse it. // - if ( (buf[buflen-4] == 'j' || buf[buflen-4] == 'J') - && (buf[buflen-3] == 'a' || buf[buflen-3] == 'A') - && (buf[buflen-2] == 'v' || buf[buflen-2] == 'V') - && (buf[buflen-1] == 'a' || buf[buflen-1] == 'A') - ) + // if ( (buf[buflen-4] == 'j' || buf[buflen-4] == 'J') + // && (buf[buflen-3] == 'a' || buf[buflen-3] == 'A') + // && (buf[buflen-2] == 'v' || buf[buflen-2] == 'V') + // && (buf[buflen-1] == 'a' || buf[buflen-1] == 'A') + // ) { - // // printf(" - %s\n", dirfil->d_name); + printf(" - %s\n", dirfil->d_name); //printf(" S"); fflush(stdout); parseFile((ANTLR_UINT8*) buf); // putc('E', stdout); fflush(stdout); @@ -282,9 +282,9 @@ putc('*', stdout); fflush(stdout); - delete psr; - delete tstream; - delete lxr; - delete input; + delete psr; psr = NULL; + delete tstream; tstream = NULL; + delete lxr; lxr = NULL; + delete input; input = NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |