     * @private
     */
    this.mixed_in_visitors_ = [];
-diff -ur ../../glslunit.orig/ast/visitors/type_annotator.js glslunit/ast/visitors/type_annotator.js
+diff -ru ../../glslunit.orig/ast/visitors/type_annotator.js glslunit/ast/visitors/type_annotator.js
 --- ../../glslunit.orig/ast/visitors/type_annotator.js	2012-05-04 20:42:54.000000000 +0200
-+++ glslunit/ast/visitors/type_annotator.js	2016-08-19 13:12:08.104255893 +0200
++++ glslunit/ast/visitors/type_annotator.js	2016-08-28 14:24:50.813364499 +0200
 @@ -19,7 +19,7 @@
  glslunit.TypeAnnotator = function(rootNode) {
    this.rootNode_ = rootNode;

   shaderProgram.vertexAst =
       vertexTransformer.transformNode(shaderProgram.vertexAst);
   shaderProgram.fragmentAst =
diff -ur ../../glslunit.orig/compiler/glsl_preprocessor.js glslunit/compiler/glsl_preprocessor.js
--- ../../glslunit.orig/compiler/glsl_preprocessor.js	2012-05-04 20:42:54.000000000 +0200
+++ glslunit/compiler/glsl_preprocessor.js	2015-07-12 09:02:18.656120680 +0200
@@ -402,7 +402,7 @@

 };
 goog.inherits(glslunit.TypeAnnotator, glslunit.VariableScopeVisitor);
 
diff -ru ../../glslunit.orig/ast/visitors/variable_scope_visitor.js glslunit/ast/visitors/variable_scope_visitor.js
--- ../../glslunit.orig/ast/visitors/variable_scope_visitor.js	2012-05-04 20:42:54.000000000 +0200
+++ glslunit/ast/visitors/variable_scope_visitor.js	2015-07-12 09:02:18.655120680 +0200
@@ -67,14 +67,14 @@
