[sc-dev] a little bitty bug fixed, commit failed

[felix@xxxxxxxxxxxxxxxxxxx]

although the cvs might probably be re-imported, i fixed a really little 
bug and tried to commit.
mostly to learn, make mistakes now.
i don't appear to have write access to the repository, although i did 
check it out as a developer.

i tried the commit from pb.
pb shows the cvs support quite nicely and allows easy reversion.
compare with base doesn't appear to work (pb 1.1.1)

the bug:
on compile the message "There is a discrepancy....
always says "there may be duplicate files..."
when sometimes there are too few files
ie. when a superclass is missing for some file.
later i'd like to finish findDiscrepancy() for the full and proper 
report.

also i reimplemented the compile time measurement / report.

here is the diff:

[localhost:SuperCollider 3/SC_server lang/LangSource] cruxxial% cvs -Q 
diff -c PyrLexer.cpp
Index: PyrLexer.cpp
===================================================================
RCS file: /cvsroot/supercollider/client-dev/SuperCollider 3/SC_server 
lang/LangSource/PyrLexer.cpp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 PyrLexer.cpp
*** PyrLexer.cpp        24 Jun 2002 14:01:06 -0000      1.1.1.1
--- PyrLexer.cpp        29 Jun 2002 14:58:08 -0000
***************
*** 34,40 ****
  int yyparse();

  extern bool gFullyFunctional;
! int compileStartTime;
  int gNumCompiledFiles;
  /*
  thisProcess.interpreter.executeFile("Macintosh HD:score").size.postln;
--- 34,40 ----
  int yyparse();

  extern bool gFullyFunctional;
! float compileStartTime;
  int gNumCompiledFiles;
  /*
  thisProcess.interpreter.executeFile("Macintosh HD:score").size.postln;
***************
*** 1492,1510 ****
                setSelectorFlags();
                if (2*numClassDeps != gNumClasses) {
                        error("There is a discrepancy.\n");
!                       post("Duplicate files may exist in the directory 
structure.\n");
!                       post("numClassDeps %d   gNumClasses %d\n", 
numClassDeps, gNumClasses);
                        findDiscrepancy();
                        compileErrors++;
                } else {
!                       int elapsed;
                        buildBigMethodMatrix();
                        SymbolTable* symbolTable = 
gMainVMGlobals->symbolTable;
                        post("   Number of Symbols %d\n", 
symbolTable->NumItems());
                        post("   Byte Code Size %d\n", totalByteCodes);
                        //elapsed = TickCount() - compileStartTime;
!                       elapsed = 0;
!                       post("   compiled %d files in %.2f seconds\n",
                                gNumCompiledFiles, elapsed / 60.);
                        post("compile done\n");
                }
--- 1492,1515 ----
                setSelectorFlags();
                if (2*numClassDeps != gNumClasses) {
                        error("There is a discrepancy.\n");
!                     if(2*numClassDeps < gNumClasses) {
!                         post("Duplicate files may exist in the 
directory structure.\n");
!                     } else {
!                         post("Some class files may be missing.\n");
!                     }
!                     post("numClassDeps %d   gNumClasses %d\n", 
numClassDeps, gNumClasses);
                        findDiscrepancy();
                        compileErrors++;
                } else {
!                       float elapsed;
                        buildBigMethodMatrix();
                        SymbolTable* symbolTable = 
gMainVMGlobals->symbolTable;
                        post("   Number of Symbols %d\n", 
symbolTable->NumItems());
                        post("   Byte Code Size %d\n", totalByteCodes);
                        //elapsed = TickCount() - compileStartTime;
!                       //elapsed = 0;
!                         elapsed = elapsedTime() - compileStartTime;
!                         post("   compiled %d files in %.2f seconds\n",
                                gNumCompiledFiles, elapsed / 60.);
                        post("compile done\n");
                }
***************
*** 1783,1789 ****
        pthread_mutex_lock (&gLangMutex);
        gNumCompiledFiles = 0;
        compiledOK = false;
!       //compileStartTime = TickCount();

        totalByteCodes = 0;

--- 1788,1794 ----
        pthread_mutex_lock (&gLangMutex);
        gNumCompiledFiles = 0;
        compiledOK = false;
!         compileStartTime = elapsedTime(); //TickCount();

        totalByteCodes = 0;


____________________
http://crucial-systems.com