zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
Removed two unnecessary steps from optimizer.

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/127471

Removed two unnecessary steps from optimizer.
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/127471
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2012-10-02 08:09:07 +0000
+++ ChangeLog	2012-10-02 12:33:39 +0000
@@ -35,6 +35,7 @@
   * Optimize positional predicates involving inequality (convert them to subsequence)
   * Optimize positional predicate that is in CNF with other predicates.
   * Optimized runtime group iterator based on latest group-by semantics.
+  * Removed two unnecessary steps from optimizer.
 
 Bug Fixes/Other Changes:
   * Fixed bug #1006960 (taking construction mode into account during no-copy rule)

=== modified file 'src/compiler/rewriter/rewriters/default_optimizer.cpp'
--- src/compiler/rewriter/rewriters/default_optimizer.cpp	2012-09-17 00:36:37 +0000
+++ src/compiler/rewriter/rewriters/default_optimizer.cpp	2012-10-02 12:33:39 +0000
@@ -84,16 +84,16 @@
       modified = true;
   }
 
+  // PathSimplification
+  if (driverPathSimplify.rewrite(rCtx))
+    modified = true;
+
  repeat1:
 
   // TypeRules
   if (driverTypeRules.rewrite(rCtx))
     modified = true;
 
-  // PathSimplification
-  if (driverPathSimplify.rewrite(rCtx))
-    modified = true;
-
   // FoldRules
   driverFoldRules.rewrite(rCtx);
 
@@ -106,6 +106,7 @@
     goto repeat1;
   }
 
+  /*
  repeat2:
 
   // This rule has been merged into the PartialEval rule
@@ -125,6 +126,7 @@
     //std::cout << "TYPES MODIFIED 2 !!!" << std::endl << std::endl;
     goto repeat2;
   }
+  */
 
   //
   driverMarkProducerNodeProps.rewrite(rCtx);

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2012-09-26 17:42:04 +0000
+++ src/context/static_context.cpp	2012-10-02 12:33:39 +0000
@@ -1048,7 +1048,6 @@
   }
 
   ar & theModuleNamespace;
-  ar & theImportedBuiltinModules;
 
   ar & theBaseUriInfo;
 

=== modified file 'test/rbkt/testdriver.cpp'
--- test/rbkt/testdriver.cpp	2012-09-20 04:54:07 +0000
+++ test/rbkt/testdriver.cpp	2012-10-02 12:33:39 +0000
@@ -26,7 +26,7 @@
 #include <time.h>
 #endif
 
-//#define ZORBA_TEST_PLAN_SERIALIZATION
+#define ZORBA_TEST_PLAN_SERIALIZATION
 
 #include "testdriverconfig.h" // SRC and BIN dir definitions
 #include "specification.h" // parsing spec files