diff --git a/gn/run_sksllex.py b/gn/run_sksllex.py
index 0377283b5ad94..5a970df784d91 100755
--- a/gn/run_sksllex.py
+++ b/gn/run_sksllex.py
@@ -20,14 +20,6 @@
                           shell=True)
     subprocess.check_call(clangFormat + " -i \"" + src +
                           "/sksl/SkSLLexer.cpp\"", shell=True)
-    subprocess.check_output([sksllex, src + "/sksl/lex/layout.lex",
-                             "LayoutLexer", "LayoutToken",
-                             src + "/sksl/SkSLLayoutLexer.h",
-                             src + "/sksl/SkSLLayoutLexer.cpp"])
-    subprocess.check_call(clangFormat + " -i \"" + src +
-                          "/sksl/SkSLLayoutLexer.h\"", shell=True)
-    subprocess.check_call(clangFormat + " -i \"" + src +
-                          "/sksl/SkSLLayoutLexer.cpp\"", shell=True)
 except subprocess.CalledProcessError as err:
     print("### Lexer error:")
     print(err.output)
diff --git a/src/gpu/gradients/GrClampedGradientEffect.cpp b/src/gpu/gradients/GrClampedGradientEffect.cpp
index 13da0ea9ff1fc..df137716acaed 100644
--- a/src/gpu/gradients/GrClampedGradientEffect.cpp
+++ b/src/gpu/gradients/GrClampedGradientEffect.cpp
@@ -36,18 +36,19 @@ class GrGLSLClampedGradientEffect : public GrGLSLFragmentProcessor {
                 args.fUniformHandler->addUniform(kFragment_GrShaderFlag, kHalf4_GrSLType,
                                                  kDefault_GrSLPrecision, "rightBorderColor");
         SkString _child1("_child1");
-        this->emitChild(1, &_child1, args);
+        this->emitChild(_outer.gradLayout_index(), &_child1, args);
         fragBuilder->codeAppendf(
                 "half4 t = %s;\nif (!%s && t.y < 0.0) {\n    %s = half4(0.0);\n} else if (t.x < "
                 "0.0) {\n    %s = %s;\n} else if (t.x > 1.0) {\n    %s = %s;\n} else {",
                 _child1.c_str(),
-                (_outer.childProcessor(1).preservesOpaqueInput() ? "true" : "false"),
+                (_outer.childProcessor(_outer.gradLayout_index()).preservesOpaqueInput() ? "true"
+                                                                                         : "false"),
                 args.fOutputColor, args.fOutputColor,
                 args.fUniformHandler->getUniformCStr(fLeftBorderColorVar), args.fOutputColor,
                 args.fUniformHandler->getUniformCStr(fRightBorderColorVar));
         SkString _input0("t");
         SkString _child0("_child0");
-        this->emitChild(0, _input0.c_str(), &_child0, args);
+        this->emitChild(_outer.colorizer_index(), _input0.c_str(), &_child0, args);
         fragBuilder->codeAppendf("\n    %s = %s;\n}\n@if (%s) {\n    %s.xyz *= %s.w;\n}\n",
                                  args.fOutputColor, _child0.c_str(),
                                  (_outer.makePremul() ? "true" : "false"), args.fOutputColor,
@@ -94,12 +95,14 @@ bool GrClampedGradientEffect::onIsEqual(const GrFragmentProcessor& other) const
 }
 GrClampedGradientEffect::GrClampedGradientEffect(const GrClampedGradientEffect& src)
         : INHERITED(kGrClampedGradientEffect_ClassID, src.optimizationFlags())
+        , fColorizer_index(src.fColorizer_index)
+        , fGradLayout_index(src.fGradLayout_index)
         , fLeftBorderColor(src.fLeftBorderColor)
         , fRightBorderColor(src.fRightBorderColor)
         , fMakePremul(src.fMakePremul)
         , fColorsAreOpaque(src.fColorsAreOpaque) {
-    this->registerChildProcessor(src.childProcessor(0).clone());
-    this->registerChildProcessor(src.childProcessor(1).clone());
+    this->registerChildProcessor(src.childProcessor(fColorizer_index).clone());
+    this->registerChildProcessor(src.childProcessor(fGradLayout_index).clone());
 }
 std::unique_ptr<GrFragmentProcessor> GrClampedGradientEffect::clone() const {
     return std::unique_ptr<GrFragmentProcessor>(new GrClampedGradientEffect(*this));
diff --git a/src/gpu/gradients/GrClampedGradientEffect.h b/src/gpu/gradients/GrClampedGradientEffect.h
index 26e6d724b2760..be4f73a0d2dd9 100644
--- a/src/gpu/gradients/GrClampedGradientEffect.h
+++ b/src/gpu/gradients/GrClampedGradientEffect.h
@@ -15,6 +15,8 @@
 #include "GrCoordTransform.h"
 class GrClampedGradientEffect : public GrFragmentProcessor {
 public:
+    int colorizer_index() const { return fColorizer_index; }
+    int gradLayout_index() const { return fGradLayout_index; }
     const SkPMColor4f& leftBorderColor() const { return fLeftBorderColor; }
     const SkPMColor4f& rightBorderColor() const { return fRightBorderColor; }
     bool makePremul() const { return fMakePremul; }
@@ -45,13 +47,19 @@ class GrClampedGradientEffect : public GrFragmentProcessor {
             , fRightBorderColor(rightBorderColor)
             , fMakePremul(makePremul)
             , fColorsAreOpaque(colorsAreOpaque) {
+        SkASSERT(colorizer);
+        fColorizer_index = this->numChildProcessors();
         this->registerChildProcessor(std::move(colorizer));
+        SkASSERT(gradLayout);
+        fGradLayout_index = this->numChildProcessors();
         this->registerChildProcessor(std::move(gradLayout));
     }
     GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
     void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
     bool onIsEqual(const GrFragmentProcessor&) const override;
     GR_DECLARE_FRAGMENT_PROCESSOR_TEST
+    int fColorizer_index = -1;
+    int fGradLayout_index = -1;
     SkPMColor4f fLeftBorderColor;
     SkPMColor4f fRightBorderColor;
     bool fMakePremul;
diff --git a/src/gpu/gradients/GrTiledGradientEffect.cpp b/src/gpu/gradients/GrTiledGradientEffect.cpp
index 0657cad42500e..5764122ffed62 100644
--- a/src/gpu/gradients/GrTiledGradientEffect.cpp
+++ b/src/gpu/gradients/GrTiledGradientEffect.cpp
@@ -29,7 +29,7 @@ class GrGLSLTiledGradientEffect : public GrGLSLFragmentProcessor {
         auto colorsAreOpaque = _outer.colorsAreOpaque();
         (void)colorsAreOpaque;
         SkString _child1("_child1");
-        this->emitChild(1, &_child1, args);
+        this->emitChild(_outer.gradLayout_index(), &_child1, args);
         fragBuilder->codeAppendf(
                 "half4 t = %s;\nif (!%s && t.y < 0.0) {\n    %s = half4(0.0);\n} else {\n    @if "
                 "(%s) {\n        half t_1 = t.x - 1.0;\n        half tiled_t = (t_1 - 2.0 * "
@@ -37,11 +37,12 @@ class GrGLSLTiledGradientEffect : public GrGLSLFragmentProcessor {
                 "       tiled_t = clamp(tiled_t, -1.0, 1.0);\n        }\n        t.x = "
                 "abs(tiled_t);\n    } else {\n        t.x = fract(t.x);\n    }",
                 _child1.c_str(),
-                (_outer.childProcessor(1).preservesOpaqueInput() ? "true" : "false"),
+                (_outer.childProcessor(_outer.gradLayout_index()).preservesOpaqueInput() ? "true"
+                                                                                         : "false"),
                 args.fOutputColor, (_outer.mirror() ? "true" : "false"));
         SkString _input0("t");
         SkString _child0("_child0");
-        this->emitChild(0, _input0.c_str(), &_child0, args);
+        this->emitChild(_outer.colorizer_index(), _input0.c_str(), &_child0, args);
         fragBuilder->codeAppendf("\n    %s = %s;\n}\n@if (%s) {\n    %s.xyz *= %s.w;\n}\n",
                                  args.fOutputColor, _child0.c_str(),
                                  (_outer.makePremul() ? "true" : "false"), args.fOutputColor,
@@ -70,11 +71,13 @@ bool GrTiledGradientEffect::onIsEqual(const GrFragmentProcessor& other) const {
 }
 GrTiledGradientEffect::GrTiledGradientEffect(const GrTiledGradientEffect& src)
         : INHERITED(kGrTiledGradientEffect_ClassID, src.optimizationFlags())
+        , fColorizer_index(src.fColorizer_index)
+        , fGradLayout_index(src.fGradLayout_index)
         , fMirror(src.fMirror)
         , fMakePremul(src.fMakePremul)
         , fColorsAreOpaque(src.fColorsAreOpaque) {
-    this->registerChildProcessor(src.childProcessor(0).clone());
-    this->registerChildProcessor(src.childProcessor(1).clone());
+    this->registerChildProcessor(src.childProcessor(fColorizer_index).clone());
+    this->registerChildProcessor(src.childProcessor(fGradLayout_index).clone());
 }
 std::unique_ptr<GrFragmentProcessor> GrTiledGradientEffect::clone() const {
     return std::unique_ptr<GrFragmentProcessor>(new GrTiledGradientEffect(*this));
diff --git a/src/gpu/gradients/GrTiledGradientEffect.h b/src/gpu/gradients/GrTiledGradientEffect.h
index ffaca8e42375e..edf26013375eb 100644
--- a/src/gpu/gradients/GrTiledGradientEffect.h
+++ b/src/gpu/gradients/GrTiledGradientEffect.h
@@ -15,6 +15,8 @@
 #include "GrCoordTransform.h"
 class GrTiledGradientEffect : public GrFragmentProcessor {
 public:
+    int colorizer_index() const { return fColorizer_index; }
+    int gradLayout_index() const { return fGradLayout_index; }
     bool mirror() const { return fMirror; }
     bool makePremul() const { return fMakePremul; }
     bool colorsAreOpaque() const { return fColorsAreOpaque; }
@@ -41,13 +43,19 @@ class GrTiledGradientEffect : public GrFragmentProcessor {
             , fMirror(mirror)
             , fMakePremul(makePremul)
             , fColorsAreOpaque(colorsAreOpaque) {
+        SkASSERT(colorizer);
+        fColorizer_index = this->numChildProcessors();
         this->registerChildProcessor(std::move(colorizer));
+        SkASSERT(gradLayout);
+        fGradLayout_index = this->numChildProcessors();
         this->registerChildProcessor(std::move(gradLayout));
     }
     GrGLSLFragmentProcessor* onCreateGLSLInstance() const override;
     void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
     bool onIsEqual(const GrFragmentProcessor&) const override;
     GR_DECLARE_FRAGMENT_PROCESSOR_TEST
+    int fColorizer_index = -1;
+    int fGradLayout_index = -1;
     bool fMirror;
     bool fMakePremul;
     bool fColorsAreOpaque;
diff --git a/src/sksl/README b/src/sksl/README
index e8159beaab88d..36617ceeca6ff 100644
--- a/src/sksl/README
+++ b/src/sksl/README
@@ -148,6 +148,10 @@ Within an '.fp' fragment processor file:
   The first variant emits the child with a solid white input color. The second
   variant emits the child with the result of the 2nd argument's expression,
   which must evaluate to a half4. The process function returns a half4.
+* By default, fragment processors must be non-null. The type for a nullable
+  fragment processor is 'fragmentProcessor?', as in
+  'in fragmentProcessor? <name>'. You can check for the presence of such a
+  fragment processor by comparing it to 'null'.
 
 
 Creating a new .fp file
diff --git a/src/sksl/SkSLCFGGenerator.cpp b/src/sksl/SkSLCFGGenerator.cpp
index c267058a79b53..9d6fb066073da 100644
--- a/src/sksl/SkSLCFGGenerator.cpp
+++ b/src/sksl/SkSLCFGGenerator.cpp
@@ -391,6 +391,7 @@ void CFGGenerator::addExpression(CFG& cfg, std::unique_ptr<Expression>* e, bool
         case Expression::kBoolLiteral_Kind:  // fall through
         case Expression::kFloatLiteral_Kind: // fall through
         case Expression::kIntLiteral_Kind:   // fall through
+        case Expression::kNullLiteral_Kind:   // fall through
         case Expression::kSetting_Kind:      // fall through
         case Expression::kVariableReference_Kind:
             cfg.fBlocks[cfg.fCurrent].fNodes.push_back({ BasicBlock::Node::kExpression_Kind,
diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
index 237148a8b7ee2..a322ebd5e9283 100644
--- a/src/sksl/SkSLCPPCodeGenerator.cpp
+++ b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -77,6 +77,32 @@ void CPPCodeGenerator::writeBinaryExpression(const BinaryExpression& b,
         if (precedence >= parentPrecedence) {
             this->write(")");
         }
+    } else if (b.fLeft->fKind == Expression::kNullLiteral_Kind ||
+               b.fRight->fKind == Expression::kNullLiteral_Kind) {
+        const Variable* var;
+        if (b.fLeft->fKind != Expression::kNullLiteral_Kind) {
+            SkASSERT(b.fLeft->fKind == Expression::kVariableReference_Kind);
+            var = &((VariableReference&) *b.fLeft).fVariable;
+        } else {
+            SkASSERT(b.fRight->fKind == Expression::kVariableReference_Kind);
+            var = &((VariableReference&) *b.fRight).fVariable;
+        }
+        SkASSERT(var->fType.kind() == Type::kNullable_Kind &&
+                 var->fType.componentType() == *fContext.fFragmentProcessor_Type);
+        this->write("%s");
+        const char* op;
+        switch (b.fOperator) {
+            case Token::EQEQ:
+                op = "<";
+                break;
+            case Token::NEQ:
+                op = ">=";
+                break;
+            default:
+                SkASSERT(false);
+        }
+        fFormatArgs.push_back("_outer." + String(var->fName) + "_index() " + op + " 0 ? \"true\" "
+                              ": \"false\"");
     } else {
         INHERITED::writeBinaryExpression(b, parentPrecedence);
     }
@@ -333,9 +359,10 @@ void CPPCodeGenerator::writeFieldAccess(const FieldAccess& access) {
         }
 
         const Type::Field& field = fContext.fFragmentProcessor_Type->fields()[access.fFieldIndex];
-        int index = getChildFPIndex((const VariableReference&) *access.fBase);
-        String cppAccess = String::printf("_outer.childProcessor(%s).%s()",
-                                          to_string(index).c_str(), String(field.fName).c_str());
+        const Variable& var = ((const VariableReference&) *access.fBase).fVariable;
+        String cppAccess = String::printf("_outer.childProcessor(_outer.%s_index()).%s()",
+                                          String(var.fName).c_str(),
+                                          String(field.fName).c_str());
 
         if (fCPPMode) {
             this->write(cppAccess.c_str());
@@ -347,7 +374,7 @@ void CPPCodeGenerator::writeFieldAccess(const FieldAccess& access) {
     INHERITED::writeFieldAccess(access);
 }
 
-int CPPCodeGenerator::getChildFPIndex(const VariableReference& reference) const {
+int CPPCodeGenerator::getChildFPIndex(const Variable& var) const {
     int index = 0;
     bool found = false;
     for (const auto& p : fProgram) {
@@ -355,9 +382,9 @@ int CPPCodeGenerator::getChildFPIndex(const VariableReference& reference) const
             const VarDeclarations& decls = (const VarDeclarations&) p;
             for (const auto& raw : decls.fVars) {
                 const VarDeclaration& decl = (VarDeclaration&) *raw;
-                if (decl.fVar == &reference.fVariable) {
+                if (decl.fVar == &var) {
                     found = true;
-                } else if (decl.fVar->fType == *fContext.fFragmentProcessor_Type) {
+                } else if (decl.fVar->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
                     ++index;
                 }
             }
@@ -388,7 +415,8 @@ void CPPCodeGenerator::writeFunctionCall(const FunctionCall& c) {
             // Second argument must also be a half4 expression
             SkASSERT("half4" == c.fArguments[1]->fType.name());
         }
-        int index = getChildFPIndex((const VariableReference&) *c.fArguments[0]);
+        const Variable& child = ((const VariableReference&) *c.fArguments[0]).fVariable;
+        int index = getChildFPIndex(child);
 
         // Start a new extra emit code section so that the emitted child processor can depend on
         // sksl variables defined in earlier sksl code.
@@ -412,9 +440,14 @@ void CPPCodeGenerator::writeFunctionCall(const FunctionCall& c) {
         // Write the output handling after the possible input handling
         String childName = "_child" + to_string(index);
         addExtraEmitCodeLine("SkString " + childName + "(\"" + childName + "\");");
-        addExtraEmitCodeLine("this->emitChild(" + to_string(index) + inputArg +
-                             ", &" + childName + ", args);");
-
+        if (c.fArguments[0]->fType.kind() == Type::kNullable_Kind) {
+            addExtraEmitCodeLine("if (_outer." + String(child.fName) + "_index() >= 0) {\n    ");
+        }
+        addExtraEmitCodeLine("this->emitChild(_outer." + String(child.fName) + "_index()" +
+                             inputArg + ", &" + childName + ", args);");
+        if (c.fArguments[0]->fType.kind() == Type::kNullable_Kind) {
+            addExtraEmitCodeLine("}");
+        }
         this->write("%s");
         fFormatArgs.push_back(childName + ".c_str()");
         return;
@@ -597,8 +630,9 @@ void CPPCodeGenerator::writePrivateVarValues() {
 }
 
 static bool is_accessible(const Variable& var) {
-    return Type::kSampler_Kind != var.fType.kind() &&
-           Type::kOther_Kind != var.fType.kind();
+    const Type& type = var.fType.nonnullable();
+    return Type::kSampler_Kind != type.kind() &&
+           Type::kOther_Kind != type.kind();
 }
 
 void CPPCodeGenerator::newExtraEmitCodeBlock() {
@@ -991,13 +1025,16 @@ void CPPCodeGenerator::writeClone() {
                      ": INHERITED(k%s_ClassID, src.optimizationFlags())", fFullName.c_str(),
                      fFullName.c_str(), fFullName.c_str(), fFullName.c_str());
         for (const auto& param : fSectionAndParameterHelper.getParameters()) {
-            if (param->fType == *fContext.fFragmentProcessor_Type) {
-                continue;
-            }
             String fieldName = HCodeGenerator::FieldName(String(param->fName).c_str());
-            this->writef("\n, %s(src.%s)",
-                         fieldName.c_str(),
-                         fieldName.c_str());
+            if (param->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
+                this->writef("\n, %s_index(src.%s_index)",
+                             fieldName.c_str(),
+                             fieldName.c_str());
+            } else {
+                this->writef("\n, %s(src.%s)",
+                             fieldName.c_str(),
+                             fieldName.c_str());
+            }
         }
         const auto transforms = fSectionAndParameterHelper.getSections(COORD_TRANSFORM_SECTION);
         for (size_t i = 0; i < transforms.size(); ++i) {
@@ -1006,14 +1043,20 @@ void CPPCodeGenerator::writeClone() {
             this->writef("\n, %s(src.%s)", fieldName.c_str(), fieldName.c_str());
         }
         this->writef(" {\n");
-        int childCount = 0;
         int samplerCount = 0;
         for (const auto& param : fSectionAndParameterHelper.getParameters()) {
             if (param->fType.kind() == Type::kSampler_Kind) {
                 ++samplerCount;
-            } else if (param->fType == *fContext.fFragmentProcessor_Type) {
-                this->writef("    this->registerChildProcessor(src.childProcessor(%d).clone());"
-                             "\n", childCount++);
+            } else if (param->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
+                String fieldName = HCodeGenerator::FieldName(String(param->fName).c_str());
+                if (param->fType.kind() == Type::kNullable_Kind) {
+                    this->writef("    if (%s_index >= 0) {\n    ", fieldName.c_str());
+                }
+                this->writef("    this->registerChildProcessor(src.childProcessor(%s_index)."
+                             "clone());\n", fieldName.c_str());
+                if (param->fType.kind() == Type::kNullable_Kind) {
+                    this->writef("    }\n");
+                }
             }
         }
         if (samplerCount) {
@@ -1182,7 +1225,7 @@ bool CPPCodeGenerator::generateCode() {
                  "    (void) that;\n",
                  fullName, fullName, fullName);
     for (const auto& param : fSectionAndParameterHelper.getParameters()) {
-        if (param->fType == *fContext.fFragmentProcessor_Type) {
+        if (param->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
             continue;
         }
         String nameString(param->fName);
diff --git a/src/sksl/SkSLCPPCodeGenerator.h b/src/sksl/SkSLCPPCodeGenerator.h
index 08d88a9988df5..bc74d3cf6b617 100644
--- a/src/sksl/SkSLCPPCodeGenerator.h
+++ b/src/sksl/SkSLCPPCodeGenerator.h
@@ -115,7 +115,7 @@ class CPPCodeGenerator : public GLSLCodeGenerator {
     // Append CPP code to the current extra emit code block.
     void addExtraEmitCodeLine(const String& toAppend);
 
-    int getChildFPIndex(const VariableReference& reference) const;
+    int getChildFPIndex(const Variable& var) const;
 
     String fName;
     String fFullName;
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index b8c68c29c9ba6..aeaf20b2853fa 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -21,6 +21,7 @@ class Context {
     Context()
     : fInvalid_Type(new Type("<INVALID>"))
     , fVoid_Type(new Type("void"))
+    , fNull_Type(new Type("null"))
     , fFloatLiteral_Type(new Type("$floatLiteral", Type::kFloat_NumberKind, 3))
     , fIntLiteral_Type(new Type("$intLiteral", Type::kSigned_NumberKind, 1))
     , fDouble_Type(new Type("double", Type::kFloat_NumberKind, 6))
@@ -208,6 +209,7 @@ class Context {
 
     const std::unique_ptr<Type> fInvalid_Type;
     const std::unique_ptr<Type> fVoid_Type;
+    const std::unique_ptr<Type> fNull_Type;
     const std::unique_ptr<Type> fFloatLiteral_Type;
     const std::unique_ptr<Type> fIntLiteral_Type;
 
diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index cb8712ef1258f..e4f0acdb0793a 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -41,7 +41,9 @@ Layout::CType HCodeGenerator::ParameterCType(const Context& context, const Type&
     if (layout.fCType != Layout::CType::kDefault) {
         return layout.fCType;
     }
-    if (type == *context.fFloat_Type || type == *context.fHalf_Type) {
+    if (type.kind() == Type::kNullable_Kind) {
+        return ParameterCType(context, type.componentType(), layout);
+    } else if (type == *context.fFloat_Type || type == *context.fHalf_Type) {
         return Layout::CType::kFloat;
     } else if (type == *context.fInt_Type ||
                type == *context.fShort_Type ||
@@ -189,7 +191,7 @@ void HCodeGenerator::writeMake() {
                      fFullName.c_str());
         separator = "";
         for (const auto& param : fSectionAndParameterHelper.getParameters()) {
-            if (param->fType == *fContext.fFragmentProcessor_Type) {
+            if (param->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
                 this->writef("%sstd::move(%s)", separator, String(param->fName).c_str());
             } else {
                 this->writef("%s%s", separator, String(param->fName).c_str());
@@ -237,7 +239,8 @@ void HCodeGenerator::writeConstructor() {
     for (const auto& param : fSectionAndParameterHelper.getParameters()) {
         String nameString(param->fName);
         const char* name = nameString.c_str();
-        if (param->fType.kind() == Type::kSampler_Kind) {
+        const Type& type = param->fType.nonnullable();
+        if (type.kind() == Type::kSampler_Kind) {
             this->writef("\n    , %s(std::move(%s)", FieldName(name).c_str(), name);
             for (const Section* s : fSectionAndParameterHelper.getSections(
                                                                           SAMPLER_PARAMS_SECTION)) {
@@ -246,7 +249,7 @@ void HCodeGenerator::writeConstructor() {
                 }
             }
             this->writef(")");
-        } else if (param->fType == *fContext.fFragmentProcessor_Type) {
+        } else if (type == *fContext.fFragmentProcessor_Type) {
             // do nothing
         } else {
             this->writef("\n    , %s(%s)", FieldName(name).c_str(), name);
@@ -270,9 +273,19 @@ void HCodeGenerator::writeConstructor() {
     for (const auto& param : fSectionAndParameterHelper.getParameters()) {
         if (param->fType.kind() == Type::kSampler_Kind) {
             ++samplerCount;
-        } else if (param->fType == *fContext.fFragmentProcessor_Type) {
-            this->writef("        this->registerChildProcessor(std::move(%s));",
+        } else if (param->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
+            if (param->fType.kind() == Type::kNullable_Kind) {
+                this->writef("        if (%s) {\n", String(param->fName).c_str());
+            } else {
+                this->writef("        SkASSERT(%s);", String(param->fName).c_str());
+            }
+            this->writef("            %s_index = this->numChildProcessors();",
+                         FieldName(String(param->fName).c_str()).c_str());
+            this->writef("            this->registerChildProcessor(std::move(%s));",
                          String(param->fName).c_str());
+            if (param->fType.kind() == Type::kNullable_Kind) {
+                this->writef("       }");
+            }
         }
     }
     if (samplerCount) {
@@ -289,12 +302,14 @@ void HCodeGenerator::writeConstructor() {
 void HCodeGenerator::writeFields() {
     this->writeSection(FIELDS_SECTION);
     for (const auto& param : fSectionAndParameterHelper.getParameters()) {
-        if (param->fType == *fContext.fFragmentProcessor_Type) {
-            continue;
+        String name = FieldName(String(param->fName).c_str());
+        if (param->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
+            this->writef("    int %s_index = -1;\n", name.c_str());
+        } else {
+            this->writef("    %s %s;\n", FieldType(fContext, param->fType,
+                                                   param->fModifiers.fLayout).c_str(),
+                                         name.c_str());
         }
-        this->writef("    %s %s;\n", FieldType(fContext, param->fType,
-                                               param->fModifiers.fLayout).c_str(),
-                     FieldName(String(param->fName).c_str()).c_str());
     }
     const auto transforms = fSectionAndParameterHelper.getSections(COORD_TRANSFORM_SECTION);
     for (size_t i = 0; i < transforms.size(); ++i) {
@@ -341,15 +356,19 @@ bool HCodeGenerator::generateCode() {
     }
     this->writeSection(CLASS_SECTION);
     for (const auto& param : fSectionAndParameterHelper.getParameters()) {
-        if (param->fType.kind() == Type::kSampler_Kind ||
-            param->fType.kind() == Type::kOther_Kind) {
+        if (param->fType.kind() == Type::kSampler_Kind) {
             continue;
         }
         String nameString(param->fName);
         const char* name = nameString.c_str();
-        this->writef("    %s %s() const { return %s; }\n",
-                     AccessType(fContext, param->fType, param->fModifiers.fLayout).c_str(), name,
-                     FieldName(name).c_str());
+        if (param->fType.nonnullable() == *fContext.fFragmentProcessor_Type) {
+            this->writef("    int %s_index() const { return %s_index; }\n", name,
+                         FieldName(name).c_str());
+        } else {
+            this->writef("    %s %s() const { return %s; }\n",
+                         AccessType(fContext, param->fType, param->fModifiers.fLayout).c_str(),
+                         name, FieldName(name).c_str());
+        }
     }
     this->writeMake();
     this->writef("    %s(const %s& src);\n"
diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index 501a10bdd78b6..30893dff561df 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -17,6 +17,7 @@
 #include "ast/SkSLASTFloatLiteral.h"
 #include "ast/SkSLASTIndexSuffix.h"
 #include "ast/SkSLASTIntLiteral.h"
+#include "ast/SkSLASTNullLiteral.h"
 #include "ir/SkSLAppendStage.h"
 #include "ir/SkSLBinaryExpression.h"
 #include "ir/SkSLBoolLiteral.h"
@@ -40,6 +41,7 @@
 #include "ir/SkSLInterfaceBlock.h"
 #include "ir/SkSLIntLiteral.h"
 #include "ir/SkSLLayout.h"
+#include "ir/SkSLNullLiteral.h"
 #include "ir/SkSLPostfixExpression.h"
 #include "ir/SkSLPrefixExpression.h"
 #include "ir/SkSLReturnStatement.h"
@@ -938,7 +940,7 @@ void IRGenerator::convertEnum(const ASTEnum& e) {
     std::vector<Variable*> variables;
     int64_t currentValue = 0;
     Layout layout;
-    ASTType enumType(e.fOffset, e.fTypeName, ASTType::kIdentifier_Kind, {});
+    ASTType enumType(e.fOffset, e.fTypeName, ASTType::kIdentifier_Kind, {}, false);
     const Type* type = this->convertType(enumType);
     Modifiers modifiers(layout, Modifiers::kConst_Flag);
     std::shared_ptr<SymbolTable> symbols(new SymbolTable(fSymbolTable, &fErrors));
@@ -970,6 +972,19 @@ void IRGenerator::convertEnum(const ASTEnum& e) {
 const Type* IRGenerator::convertType(const ASTType& type) {
     const Symbol* result = (*fSymbolTable)[type.fName];
     if (result && result->fKind == Symbol::kType_Kind) {
+        if (type.fNullable) {
+            if (((Type&) *result) == *fContext.fFragmentProcessor_Type) {
+                if (type.fSizes.size()) {
+                    fErrors.error(type.fOffset, "type '" + type.fName + "' may not be used in "
+                                                "an array");
+                }
+                result = new Type(String(result->fName) + "?", Type::kNullable_Kind,
+                                  (const Type&) *result);
+                fSymbolTable->takeOwnership((Type*) result);
+            } else {
+                fErrors.error(type.fOffset, "type '" + type.fName + "' may not be nullable");
+            }
+        }
         for (int size : type.fSizes) {
             String name(result->fName);
             name += "[";
@@ -1001,6 +1016,8 @@ std::unique_ptr<Expression> IRGenerator::convertExpression(const ASTExpression&
                                                                 ((ASTFloatLiteral&) expr).fValue));
         case ASTExpression::kBinary_Kind:
             return this->convertBinaryExpression((ASTBinaryExpression&) expr);
+        case ASTExpression::kNull_Kind:
+            return std::unique_ptr<Expression>(new NullLiteral(fContext, expr.fOffset));
         case ASTExpression::kPrefix_Kind:
             return this->convertPrefixExpression((ASTPrefixExpression&) expr);
         case ASTExpression::kSuffix_Kind:
@@ -1118,6 +1135,10 @@ std::unique_ptr<Expression> IRGenerator::coerce(std::unique_ptr<Expression> expr
         SkASSERT(ctor);
         return this->call(-1, std::move(ctor), std::move(args));
     }
+    if (expr->fKind == Expression::kNullLiteral_Kind) {
+        SkASSERT(type.kind() == Type::kNullable_Kind);
+        return std::unique_ptr<Expression>(new NullLiteral(expr->fOffset, type));
+    }
     std::vector<std::unique_ptr<Expression>> args;
     args.push_back(std::move(expr));
     return std::unique_ptr<Expression>(new Constructor(-1, type, std::move(args)));
diff --git a/src/sksl/SkSLLexer.cpp b/src/sksl/SkSLLexer.cpp
index 2b90582511fd8..4dfc3df99c2c7 100644
--- a/src/sksl/SkSLLexer.cpp
+++ b/src/sksl/SkSLLexer.cpp
@@ -18,7 +18,7 @@ static int8_t mappings[127] = {
         26, 26, 26, 27, 26, 6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  28, 6,  6,  6,
         29, 6,  6,  30, 3,  31, 32, 33, 3,  34, 35, 36, 37, 38, 39, 40, 41, 42, 6,  43, 44, 45,
         46, 47, 48, 6,  49, 50, 51, 52, 53, 54, 55, 56, 6,  57, 58, 59, 60};
-static int16_t transitions[61][316] = {
+static int16_t transitions[61][319] = {
         {
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -31,7 +31,7 @@ static int16_t transitions[61][316] = {
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 2, 3, 3, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -45,7 +45,7 @@ static int16_t transitions[61][316] = {
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 3, 3, 3, 0, 0, 0, 0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -59,7 +59,7 @@ static int16_t transitions[61][316] = {
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 4, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -73,7 +73,7 @@ static int16_t transitions[61][316] = {
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 5, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -87,7 +87,7 @@ static int16_t transitions[61][316] = {
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 7, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -101,7 +101,7 @@ static int16_t transitions[61][316] = {
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0,  9,  0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -119,7 +119,7 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
                 0, 11, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -133,7 +133,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -148,7 +148,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
                 0, 17, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -162,7 +162,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 18, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -176,7 +176,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 19, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -191,7 +191,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
                 0,  21, 0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 22, 0, 0, 0,
@@ -206,7 +206,7 @@ static int16_t transitions[61][316] = {
                 0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0,
                 0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0,
                 0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0,
-                0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
                 0, 24, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -220,7 +220,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0,  25, 0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0,
@@ -235,7 +235,7 @@ static int16_t transitions[61][316] = {
                 0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0,
                 0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0,
                 0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,  0, 0, 0,  0, 0, 0,
-                0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0,  0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
                 0, 29, 0, 0, 0, 0,  0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -250,7 +250,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0,  0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0,  0, 0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0, 0,  0, 0, 0, 0,  0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0,
         },
         {
                 0, 34, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -265,7 +265,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
                 0,  40, 0,  0,  0,  0,  0,  0,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -283,7 +283,7 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
                 0,  55, 0,  0,  0,  0,  0,  0,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -301,7 +301,7 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
                 0, 56, 0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -316,7 +316,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0, 0,  0, 0, 0, 0, 0,  0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
                 0, 58, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -330,7 +330,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 59, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -345,23 +345,23 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
-                0, 63, 0,  0, 0, 6, 0, 0, 0, 0, 0, 12,  0,  16,  15, 0,  0, 0,  0, 20, 0, 23, 0,
-                0, 0,  27, 0, 0, 0, 0, 0, 0, 0, 0, 39,  35, 35,  0,  38, 0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  62,  61, 0,  0, 64, 0, 66, 0, 68, 0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  83,  0,  85, 0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0,   0,  0,  0, 0,  0, 0,  0, 0,  0,
-                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 311, 0,  313, 0,  0,  0,
+                0, 63, 0,  0, 0, 6, 0, 0, 0, 0, 0, 12, 0,  16, 15,  0,  0,   0,  0, 20, 0, 23, 0,
+                0, 0,  27, 0, 0, 0, 0, 0, 0, 0, 0, 39, 35, 35, 0,   38, 0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  62, 61,  0,  0,   64, 0, 66, 0, 68, 0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  83, 0,   85, 0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,   0,  0,   0,  0, 0,  0, 0,  0,
+                0, 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0,  314, 0,  316, 0,  0, 0,
         },
         {
                 0,  65, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -376,7 +376,7 @@ static int16_t transitions[61][316] = {
                 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,  0, 0, 0,
         },
         {
                 0, 69, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -390,7 +390,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 70, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -404,7 +404,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0,  9,  0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -422,7 +422,7 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
                 0,  9,  0,  0,  0,   0,  0,  8,  8,  10, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -440,7 +440,7 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10,  10, 10, 10, 10, 0,  0,   0,  0,  0,  0,  0,
+                10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
                 0,   9,  0,  0,  0,  0,  0,   8,  8,  10, 10, 0,  0,   0,  0,  0,  0,  0,  0,  0,
@@ -458,7 +458,7 @@ static int16_t transitions[61][316] = {
                 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,
                 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,
                 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10,  10, 10, 10, 10, 10, 10,  10, 10, 0,  0,  0,  0,   0,  0,  0,
+                10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 0,   0,  0,  0,  0,  0,  0,
         },
         {
                 0,  9,  0,  0,  0,  0,   0,  8,  8,  10, 10, 0,   0,  0,  0,  0,  0,  0,  0,  0,
@@ -476,7 +476,7 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 10,  10, 10, 10, 0,  0,  0,   0,  0,  0,  0,
+                10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  0,  0,  0,  0,  0,  0,  0,
         },
         {
                 0, 80, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -490,7 +490,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 81, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -504,7 +504,7 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
                 0, 82, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -518,44 +518,44 @@ static int16_t transitions[61][316] = {
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0,
+                0, 0,  0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         },
         {
-                0,  86, 0,  0,  0,  0,  0,  8,  8,  10,  10, 0,  0,  0,   0,  0,  0,  0,  0,   0,
-                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,   0,  35, 35, 0,  38,  0,
-                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,   0,  0,  0,  0,  0,   0,
-                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   71, 71, 71, 71,  71, 71, 71, 71, 71,  71,
-                0,  0,  0,  0,  0,  0,  87, 10, 10, 10,  10, 10, 93, 10,  10, 10, 10, 10, 102, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 250, 10, 10, 10, 254, 10, 10, 10, 10, 259, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10,  10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 0,   0,  0,  0,  0,   0,  0,
+                0,  86,  0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,   0,  0,  0,  0,   0,  0,   0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  35, 35,  0,  38,  0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,   0,  0,   0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  71, 71, 71,  71, 71, 71, 71,  71, 71,  71,
+                0,  0,   0,  0,  0,  0,  87, 10, 10, 10, 10, 10, 93,  10, 10, 10, 10,  10, 102, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 253, 10, 10, 10, 257, 10, 10,  10,
+                10, 262, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,   0,  0,  0,  0,   0,  0,
         },
         {
-                0,  9,  0,   0,   0,   0,   0,  8,  8,  10, 10,  0,  0,  0,  0,   0,  0,   0,  0,
-                0,  0,  0,   0,   0,   0,   0,  0,  0,  0,  0,   0,  0,  0,  0,   0,  35,  35, 0,
-                38, 0,  0,   0,   0,   0,   0,  0,  0,  0,  0,   0,  0,  0,  0,   54, 54,  0,  0,
-                0,  0,  0,   0,   0,   0,   0,  0,  0,  0,  0,   0,  0,  71, 71,  71, 71,  71, 71,
-                71, 71, 71,  71,  0,   0,   0,  0,  0,  0,  10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 97, 10,  10,  10,  10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 10, 117, 10,  10,  10,  10, 10, 10, 10, 125, 10, 10, 10, 129, 10, 10,  10, 10,
-                10, 10, 10,  10,  10,  10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 150, 10, 10,
-                10, 10, 10,  10,  157, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 169, 10, 10,
-                10, 10, 174, 10,  10,  10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 190,
-                10, 10, 10,  10,  10,  10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 10, 10,  10,  10,  10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 10, 10,  232, 10,  10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 10, 10,  10,  252, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 10, 10,  10,  10,  10,  10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 10, 10,  10,  10,  291, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
-                10, 10, 10,  10,  10,  0,   0,  0,  0,  0,  0,   0,
+                0,  9,  0,   0,  0,   0,  0,   8,   8,   10, 10,  0,  0,  0,  0,   0,  0,   0,  0,
+                0,  0,  0,   0,  0,   0,  0,   0,   0,   0,  0,   0,  0,  0,  0,   0,  35,  35, 0,
+                38, 0,  0,   0,  0,   0,  0,   0,   0,   0,  0,   0,  0,  0,  0,   54, 54,  0,  0,
+                0,  0,  0,   0,  0,   0,  0,   0,   0,   0,  0,   0,  0,  71, 71,  71, 71,  71, 71,
+                71, 71, 71,  71, 0,   0,  0,   0,   0,   0,  10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 97, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 10, 117, 10, 10,  10, 10,  10,  10,  10, 125, 10, 10, 10, 129, 10, 10,  10, 10,
+                10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10, 10, 10,  10, 150, 10, 10,
+                10, 10, 10,  10, 157, 10, 10,  10,  10,  10, 10,  10, 10, 10, 10,  10, 169, 10, 10,
+                10, 10, 174, 10, 10,  10, 10,  10,  10,  10, 10,  10, 10, 10, 10,  10, 10,  10, 190,
+                10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 10, 10,  10, 10,  10, 235, 10,  10,  10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 10, 10,  10, 10,  10, 10,  255, 10,  10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 10, 10,  10, 10,  10, 10,  10,  294, 10, 10,  10, 10, 10, 10,  10, 10,  10, 10,
+                10, 10, 10,  10, 10,  10, 10,  10,  0,   0,  0,   0,  0,  0,  0,
         },
         {
                 0,  114, 0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -573,82 +573,83 @@ static int16_t transitions[61][316] = {
                 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0,  124, 0,  0,   0,  0,  0,  8,  8,   10, 10, 0,  0,  0,   0,   0,  0,   0,  0,
-                0,  0,   0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  0,  0,   0,   0,  35,  35, 0,
-                38, 0,   0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  0,  0,   0,   54, 54,  0,  0,
-                0,  0,   0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  0,  71,  71,  71, 71,  71, 71,
-                71, 78,  71, 71,  0,  0,  0,  0,  0,   0,  10, 10, 10, 10,  10,  10, 10,  10, 10,
-                96, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 156, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 213, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  224, 10, 10,  10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 242, 10,  10, 10,  10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 264, 10, 10,
-                10, 10,  10, 270, 10, 10, 10, 10, 275, 10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10, 10,  10, 10,
-                10, 10,  10, 10,  10, 0,  0,  0,  0,   0,  0,  0,
+                0,   124, 0,  0,   0,  0,  0,   8,  8,  10, 10, 0,   0,  0,  0,  0,  0,   0,   0,
+                0,   0,   0,  0,   0,  0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  0,  35,  35,  0,
+                38,  0,   0,  0,   0,  0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  54, 54,  0,   0,
+                0,   0,   0,  0,   0,  0,  0,   0,  0,  0,  0,  0,   0,  71, 71, 71, 71,  71,  71,
+                71,  78,  71, 71,  0,  0,  0,   0,  0,  0,  10, 10,  10, 10, 10, 10, 10,  10,  10,
+                96,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 156, 10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 213, 10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  227, 10,
+                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 245, 10,  10,
+                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                267, 10,  10, 10,  10, 10, 273, 10, 10, 10, 10, 278, 10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10,  10,  10,
+                10,  10,  10, 10,  10, 10, 10,  10, 0,  0,  0,  0,   0,  0,  0,
         },
         {
-                0,  147, 0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,   0,  0,  0,  0,   0,  0,   0,
-                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  35, 35,  0,  38,  0,
-                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   54, 54, 0,  0,   0,  0,   0,
-                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  71, 71, 71,  71, 71, 71, 71,  71, 71,  71,
-                0,  0,   0,  0,  0,  0,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 159, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  200,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 233, 10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 257, 10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10,  10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,   0,  0,  0,
+                0,  147, 0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,   0,  0,  0,   0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  35,  35, 0,  38,  0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  54, 54, 0,   0,  0,  0,   0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  71, 71, 71, 71, 71, 71,  71, 71, 71,  71,
+                0,  0,   0,  0,  0,  0,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 159, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  200,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 236, 10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  260,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,   0,  0,  0,
         },
         {
-                0,   161, 0,  0,   0,  0,   0,   8,   8,  10,  10,  0,   0,  0,   0,   0,   0,  0,
-                0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,   0,   31, 0,   0,   0,   0,  35,
-                35,  0,   38, 0,   50, 46,  43,  0,   0,  0,   0,   0,   0,  50,  0,   0,   0,  54,
-                54,  50,  0,  0,   0,  0,   0,   0,   0,  0,   0,   0,   0,  0,   0,   0,   71, 71,
-                71,  71,  71, 71,  71, 71,  71,  71,  0,  0,   0,   0,   0,  0,   10,  10,  10, 10,
-                91,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10, 10,  10,  116, 10, 10,  10,  10,  10, 122, 10,  10,  10, 10,
-                127, 10,  10, 10,  10, 10,  10,  134, 10, 136, 10,  10,  10, 10,  10,  10,  10, 10,
-                10,  146, 10, 148, 10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10,  10,  10, 10,
-                10,  164, 10, 10,  10, 10,  10,  10,  10, 172, 10,  10,  10, 10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10,  10,  10, 10,
-                199, 10,  10, 10,  10, 10,  10,  10,  10, 208, 10,  10,  10, 212, 10,  10,  10, 10,
-                217, 10,  10, 10,  10, 10,  223, 10,  10, 10,  10,  10,  10, 10,  231, 10,  10, 10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10, 258, 10,  260, 10, 10,  263, 10,  10, 10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 280, 10,  10,  10, 10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10, 10,  295, 10,  10, 10,  10,  300, 10, 10,  10,  304, 10, 10,
-                10,  10,  10, 0,   0,  0,   0,   0,   0,  0,
+                0,   161, 0,  0,   0,  0,  0,  8,   8,   10,  10,  0,  0,   0,   0,   0,  0,  0,
+                0,   0,   0,  0,   0,  0,  0,  0,   0,   0,   0,   0,  31,  0,   0,   0,  0,  35,
+                35,  0,   38, 0,   50, 46, 43, 0,   0,   0,   0,   0,  0,   50,  0,   0,  0,  54,
+                54,  50,  0,  0,   0,  0,  0,  0,   0,   0,   0,   0,  0,   0,   0,   0,  71, 71,
+                71,  71,  71, 71,  71, 71, 71, 71,  0,   0,   0,   0,  0,   0,   10,  10, 10, 10,
+                91,  10,  10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10, 10, 10, 116, 10,  10,  10,  10, 10,  122, 10,  10, 10, 10,
+                127, 10,  10, 10,  10, 10, 10, 134, 10,  136, 10,  10, 10,  10,  10,  10, 10, 10,
+                10,  146, 10, 148, 10, 10, 10, 10,  10,  10,  10,  10, 10,  10,  10,  10, 10, 10,
+                10,  164, 10, 10,  10, 10, 10, 10,  10,  172, 10,  10, 10,  10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10,  10,  10, 10, 10,
+                199, 10,  10, 10,  10, 10, 10, 10,  10,  208, 10,  10, 10,  212, 10,  10, 10, 10,
+                217, 10,  10, 10,  10, 10, 10, 10,  10,  226, 10,  10, 10,  10,  10,  10, 10, 234,
+                10,  10,  10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10, 10, 10, 10,  261, 10,  263, 10, 10,  266, 10,  10, 10, 10,
+                10,  10,  10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 283, 10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10, 10, 10, 10,  10,  298, 10,  10, 10,  10,  303, 10, 10, 10,
+                307, 10,  10, 10,  10, 10, 0,  0,   0,   0,   0,   0,  0,
         },
         {
-                0,   168, 0,  0,   0,  0,  0,  8,  8,   10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
-                0,   0,   0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  35, 35, 0,  38, 0,
-                0,   0,   0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  0,  54, 54, 0,  0,  0,  0,  0,
-                0,   0,   0,  0,   0,  0,  0,  0,  0,   0,  71, 71, 73, 71, 71, 71, 71, 71, 71, 71,
-                0,   0,   0,  0,   0,  0,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 120,
-                121, 10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10, 10, 149, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 184, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                261, 262, 10, 10,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 284, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10, 10, 10,  0,  0,  0,  0,  0,  0,  0,
+                0,  168, 0,  0,  0,  0,   0,   8,  8,  10, 10, 0,  0,   0,  0,  0,   0,   0,   0,
+                0,  0,   0,  0,  0,  0,   0,   0,  0,  0,  0,  0,  0,   0,  0,  0,   35,  35,  0,
+                38, 0,   0,  0,  0,  0,   0,   0,  0,  0,  0,  0,  0,   0,  0,  54,  54,  0,   0,
+                0,  0,   0,  0,  0,  0,   0,   0,  0,  0,  0,  0,  0,   71, 71, 73,  71,  71,  71,
+                71, 71,  71, 71, 0,  0,   0,   0,  0,  0,  10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 120, 121, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 149, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 184, 10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  264, 265, 10,
+                10, 10,  10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 287, 10, 10, 10, 10,  10,  10, 10, 10, 10, 10, 10,  10, 10, 10,  10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10,  10, 0,  0,  0,  0,  0,   0,  0,
         },
         {
                 0,  9,  0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -666,145 +667,143 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0,  178, 0,  0,   0,  0,  0,  8,  8,  10,  10, 0,   0,  0,  0,  0,  0,  0,  0,
-                0,  0,   0,  0,   0,  0,  0,  0,  0,  0,   0,  0,   0,  0,  0,  0,  35, 35, 0,
-                38, 0,   0,  0,   0,  0,  0,  0,  0,  0,   0,  0,   0,  0,  0,  0,  0,  0,  0,
-                0,  0,   0,  0,   0,  0,  0,  0,  0,  0,   0,  0,   0,  71, 71, 71, 71, 71, 71,
-                71, 71,  79, 71,  0,  0,  0,  0,  0,  0,   10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 133,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 181, 10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 251, 10, 10, 10, 10, 10, 10,  10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 276, 10, 10,  10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10, 10, 10, 10,  10, 297, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10, 10,  10, 0,  0,  0,  0,  0,   0,  0,
+                0,  178, 0,  0,  0,  0,  0,   8,  8,  10,  10, 0,  0,   0,  0,   0,  0,  0,  0,
+                0,  0,   0,  0,  0,  0,  0,   0,  0,  0,   0,  0,  0,   0,  0,   0,  35, 35, 0,
+                38, 0,   0,  0,  0,  0,  0,   0,  0,  0,   0,  0,  0,   0,  0,   0,  0,  0,  0,
+                0,  0,   0,  0,  0,  0,  0,   0,  0,  0,   0,  0,  0,   71, 71,  71, 71, 71, 71,
+                71, 71,  79, 71, 0,  0,  0,   0,  0,  0,   10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 133,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 181, 10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 254, 10, 10, 10,  10, 10, 10,  10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 279, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10, 300, 10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10,  10, 0,  0,   0,  0,  0,   0,  0,
         },
         {
-                0,  183, 0,   0,   0,   0,  0,   8,  8,   10,  10,  0,  0,   0,   0,  0,  0,   0,
-                0,  0,   0,   0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,   0,  0,  0,   35,
-                35, 0,   38,  0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,   0,  0,  0,   0,
-                0,  0,   0,   0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,   0,  0,  72,  71,
-                71, 71,  71,  76,  71,  71, 71,  71, 0,   0,   0,   0,  0,   0,   10, 10, 89,  10,
-                10, 10,  10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 103, 10,  10, 10, 10,  10,
-                10, 10,  10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10, 10, 10,  10,
-                10, 10,  10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10, 10, 143, 10,
-                10, 10,  10,  154, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10, 10, 10,  10,
-                10, 10,  10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10, 10, 179, 10,
-                10, 10,  10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10, 10, 10,  10,
-                10, 10,  201, 10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10, 10, 215, 10,
-                10, 10,  10,  10,  10,  10, 10,  10, 225, 10,  227, 10, 10,  10,  10, 10, 10,  10,
-                10, 10,  10,  10,  10,  10, 241, 10, 10,  10,  10,  10, 10,  10,  10, 10, 10,  10,
-                10, 10,  10,  256, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10, 10, 10,  10,
-                10, 10,  273, 10,  10,  10, 10,  10, 10,  10,  10,  10, 283, 10,  10, 10, 10,  10,
-                10, 10,  10,  10,  293, 10, 10,  10, 10,  298, 10,  10, 10,  302, 10, 10, 10,  10,
-                10, 10,  10,  0,   0,   0,  0,   0,  0,   0,
+                0,  183, 0,   0,   0,  0,   0,   8,   8,  10,  10, 0,   0,   0,   0,  0,   0,   0,
+                0,  0,   0,   0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,   35,
+                35, 0,   38,  0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,   0,
+                0,  0,   0,   0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   72,  71,
+                71, 71,  71,  76,  71, 71,  71,  71,  0,  0,   0,  0,   0,   0,   10, 10,  89,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  103, 10,  10, 10,  10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  143, 10,
+                10, 10,  10,  154, 10, 10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  179, 10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10,
+                10, 10,  201, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  215, 10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 228, 10,  230, 10, 10,  10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 244, 10, 10,  10,  10,  10, 10,  10,  10,
+                10, 10,  10,  10,  10, 10,  259, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10,  10,
+                10, 10,  10,  10,  10, 276, 10,  10,  10, 10,  10, 10,  10,  10,  10, 286, 10,  10,
+                10, 10,  10,  10,  10, 10,  10,  296, 10, 10,  10, 10,  301, 10,  10, 10,  305, 10,
+                10, 10,  10,  10,  10, 10,  0,   0,   0,  0,   0,  0,   0,
         },
         {
-                0,  9,  0,  0,  0,  0,  0,  8,  8,   10, 10, 0,  0,  0,  0,  0,  0,  0,   0,  0,
-                0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  35, 35, 0,   38, 0,
-                0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,
-                0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  71, 71, 71, 71, 71, 71, 71, 71,  71, 71,
-                0,  0,  0,  0,  0,  0,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 118, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 249, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10,  0,  0,  0,  0,  0,  0,  0,
+                0,  9,  0,  0,  0,  0,  0,  8,  8,  10, 10, 0,   0,  0,  0,  0,  0,  0,   0,  0,
+                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  35, 35, 0,   38, 0,
+                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,   0,  0,
+                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  71, 71,  71, 71, 71, 71, 71, 71,  71, 71,
+                0,  0,  0,  0,  0,  0,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 118, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 252, 10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  0,  0,  0,  0,  0,  0,   0,
         },
         {
-                0,   189, 0,  0,  0,  0,   0,   8,   8,  10, 10,  0,  0,  0,  0,  0,  0,   0,
-                0,   0,   0,  0,  0,  0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   35,
-                35,  0,   38, 0,  0,  0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   0,
-                0,   0,   0,  0,  0,  0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  71,  71,
-                71,  71,  71, 71, 71, 71,  71,  71,  0,  0,  0,   0,  0,  0,  10, 10, 10,  10,
-                10,  92,  10, 94, 10, 10,  10,  98,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 128, 10,
-                10,  10,  10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10,  152, 10, 10, 10,  10, 10, 10, 10, 10, 10,  162,
-                10,  10,  10, 10, 10, 10,  173, 170, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  236, 10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,
-                10,  290, 10, 10, 10, 294, 10,  10,  10, 10, 299, 10, 10, 10, 10, 10, 10,  10,
-                307, 10,  10, 0,  0,  0,   0,   0,   0,  0,
+                0,  189, 0,  0,  0,  0,   0,  8,   8,  10,  10,  0,   0,  0,  0,  0,  0,   0,   0,
+                0,  0,   0,  0,  0,  0,   0,  0,   0,  0,   0,   0,   0,  0,  0,  0,  35,  35,  0,
+                38, 0,   0,  0,  0,  0,   0,  0,   0,  0,   0,   0,   0,  0,  0,  0,  0,   0,   0,
+                0,  0,   0,  0,  0,  0,   0,  0,   0,  0,   0,   0,   0,  71, 71, 71, 71,  71,  71,
+                71, 71,  71, 71, 0,  0,   0,  0,   0,  0,   10,  10,  10, 10, 10, 92, 10,  94,  10,
+                10, 10,  98, 10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 10,  128, 10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10, 10, 10, 10,  10,  152,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 162, 10,  10,  10, 10, 10, 10, 173, 170, 10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 219, 220, 10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 10,  239, 10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 10,  10, 10,  10,  10,  10, 10, 10, 10, 10,  10,  10,
+                10, 10,  10, 10, 10, 10,  10, 293, 10, 10,  10,  297, 10, 10, 10, 10, 302, 10,  10,
+                10, 10,  10, 10, 10, 310, 10, 10,  0,  0,   0,   0,   0,  0,  0,
         },
         {
-                0,  198, 0,   0,  0,  0,  0,   8,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
-                0,  0,   0,   0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  35, 35, 0,  38, 0,
-                0,  0,   0,   0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-                0,  0,   0,   0,  0,  0,  0,   0,  0,  0,  71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-                0,  0,   0,   0,  0,  0,  10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 167, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  203, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 287, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10,  10,  10, 10, 10, 10,  10, 10, 0,  0,  0,  0,  0,  0,  0,
+                0,  198, 0,   0,  0,  0,  0,   8,  8,  10,  10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
+                0,  0,   0,   0,  0,  0,  0,   0,  0,  0,   0,  0,  0,  0,  0,  35, 35, 0,  38, 0,
+                0,  0,   0,   0,  0,  0,  0,   0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+                0,  0,   0,   0,  0,  0,  0,   0,  0,  0,   71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+                0,  0,   0,   0,  0,  0,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 167, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  203, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 290, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0,   205, 0,  0,   0,  0,  0,   8,  8,  10, 10,  0,   0,   0,   0,  0,  0,  0,
-                0,   0,   0,  0,   0,  0,  0,   0,  0,  0,  0,   0,   0,   0,   0,  0,  0,  35,
-                35,  0,   38, 0,   0,  0,  0,   0,  0,  0,  0,   0,   0,   0,   0,  0,  0,  0,
-                0,   0,   0,  0,   0,  0,  0,   0,  0,  0,  0,   0,   0,   0,   0,  0,  71, 71,
-                71,  71,  71, 71,  71, 71, 71,  71, 0,  0,  0,   0,   0,   0,   10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  10,  104, 10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 139, 10, 10, 10, 137, 10,  10,  10,  10, 10, 10, 144,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10, 10, 165,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10, 10, 10,
-                10,  10,  10, 185, 10, 10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  229, 10,  10, 10, 10, 10,
-                235, 10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  247, 10,  10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  282, 10,  10,  10, 10, 10, 10,
-                10,  10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10,  10,  10,  10, 10, 10, 306,
-                10,  10,  10, 0,   0,  0,  0,   0,  0,  0,
+                0,  205, 0,   0,   0,   0,  0,  8,  8,   10,  10,  0,  0,   0,  0,  0,  0,  0,  0,
+                0,  0,   0,   0,   0,   0,  0,  0,  0,   0,   0,   0,  0,   0,  0,  0,  35, 35, 0,
+                38, 0,   0,   0,   0,   0,  0,  0,  0,   0,   0,   0,  0,   0,  0,  0,  0,  0,  0,
+                0,  0,   0,   0,   0,   0,  0,  0,  0,   0,   0,   0,  0,   71, 71, 71, 71, 71, 71,
+                71, 71,  71,  71,  0,   0,  0,  0,  0,   0,   10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  10,  10, 10, 10, 104, 10,  10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10, 10,  10, 10, 10, 10, 10, 139,
+                10, 10,  10,  137, 10,  10, 10, 10, 10,  10,  144, 10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  10,  10, 10, 10, 10,  165, 10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10, 185, 10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  232, 10,  10, 10, 10, 10,  238, 10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  250, 10,  10,  10, 10, 10, 10,  10,  10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10, 10,  10, 10, 10, 10, 10, 285,
+                10, 10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10, 10,  10, 10, 10, 10, 10, 10,
+                10, 10,  10,  10,  309, 10, 10, 10, 0,   0,   0,   0,  0,   0,  0,
         },
         {
-                0,   218, 0,  0,   0,  0,   0,   8,   8,  10,  10, 0,   0,   0,  0,   0,  0,   0,
-                0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,  0,   35,
-                35,  0,   38, 0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,  0,   0,
-                0,   0,   0,  0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,  71,  71,
-                71,  71,  71, 71,  71, 71,  71,  71,  0,  0,   0,  0,   0,   0,  10,  10, 10,  10,
-                10,  10,  10, 10,  95, 10,  10,  10,  10, 10,  10, 10,  108, 10, 10,  10, 10,  10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 132, 10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
-                10,  10,  10, 160, 10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
-                10,  10,  10, 10,  10, 10,  176, 10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
-                10,  10,  10, 10,  10, 186, 10,  10,  10, 195, 10, 192, 10,  10, 10,  10, 10,  10,
-                10,  10,  10, 10,  10, 10,  10,  206, 10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 228, 10,  10, 10,  10, 10,  234,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
-                10,  10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 285, 10, 10,  10,
-                289, 10,  10, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 305, 10,
-                10,  10,  10, 0,   0,  0,   0,   0,   0,  0,
+                0,  221, 0,   0,   0,  0,   0,   8,   8,  10,  10, 0,   0,   0,  0,   0,  0,   0,
+                0,  0,   0,   0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,  0,   35,
+                35, 0,   38,  0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,  0,   0,
+                0,  0,   0,   0,   0,  0,   0,   0,   0,  0,   0,  0,   0,   0,  0,   0,  71,  71,
+                71, 71,  71,  71,  71, 71,  71,  71,  0,  0,   0,  0,   0,   0,  10,  10, 10,  10,
+                10, 10,  10,  10,  95, 10,  10,  10,  10, 10,  10, 10,  108, 10, 10,  10, 10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 132, 10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
+                10, 10,  10,  160, 10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
+                10, 10,  10,  10,  10, 10,  176, 10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
+                10, 10,  10,  10,  10, 186, 10,  10,  10, 195, 10, 192, 10,  10, 10,  10, 10,  10,
+                10, 10,  10,  10,  10, 10,  10,  206, 10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 231, 10, 10,  10,
+                10, 10,  237, 10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
+                10, 10,  10,  10,  10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  288,
+                10, 10,  10,  292, 10, 10,  10,  10,  10, 10,  10, 10,  10,  10, 10,  10, 10,  10,
+                10, 308, 10,  10,  10, 10,  0,   0,   0,  0,   0,  0,   0,
         },
         {
-                0,  221, 0,  0,   0,  0,  0,   8,  8,  10, 10,  0,  0,  0,  0,  0,  0,   0,  0,  0,
+                0,  224, 0,  0,   0,  0,  0,   8,  8,  10, 10,  0,  0,  0,  0,  0,  0,   0,  0,  0,
                 0,  0,   0,  0,   0,  0,  0,   0,  0,  0,  0,   0,  0,  0,  0,  35, 35,  0,  38, 0,
                 0,  0,   0,  0,   0,  0,  0,   0,  0,  0,  0,   0,  0,  0,  0,  0,  0,   0,  0,  0,
                 0,  0,   0,  0,   0,  0,  0,   0,  0,  0,  71,  71, 71, 71, 71, 71, 71,  71, 71, 71,
@@ -819,89 +818,88 @@ static int16_t transitions[61][316] = {
                 10, 10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
                 10, 10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
                 10, 10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10,  10, 10,  10, 10, 10,  10, 10, 0,  0,   0,  0,  0,  0,  0,
+                10, 10,  10, 10,  10, 10, 10,  10, 10, 10, 10,  10, 0,  0,  0,  0,  0,   0,  0,
         },
         {
-                0,   230, 0,  0,  0,  0,   0,  8,  8,   10, 10, 0,   0,   0,  0,  0,  0,  0,   0,
-                0,   0,   0,  0,  0,  0,   0,  0,  0,   0,  0,  0,   0,   0,  0,  0,  35, 35,  0,
-                38,  0,   0,  0,  0,  0,   0,  0,  0,   0,  0,  0,   0,   0,  0,  0,  0,  0,   0,
-                0,   0,   0,  0,  0,  0,   0,  0,  0,   0,  0,  0,   0,   71, 71, 71, 71, 71,  71,
-                71,  71,  71, 71, 0,  0,   0,  0,  0,   0,  10, 10,  10,  10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10,  10, 10, 10, 10, 10,  10,
-                115, 10,  10, 10, 10, 10,  10, 10, 123, 10, 10, 10,  10,  10, 10, 10, 10, 10,  10,
-                10,  135, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10,  10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 158, 10, 10, 10,  10, 10, 10,  10,  10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 177, 10, 10, 10,  10, 10, 10,  10,  10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10,  10, 10, 10, 10, 10,  209,
-                10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  222, 10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 240, 10,  10, 10, 10, 10, 246, 10,
-                10,  10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 10,  10,  10, 10, 10, 10, 10,  10,
-                10,  268, 10, 10, 10, 10,  10, 10, 10,  10, 10, 278, 10,  10, 10, 10, 10, 10,  10,
-                286, 10,  10, 10, 10, 10,  10, 10, 10,  10, 10, 301, 10,  10, 10, 10, 10, 10,  10,
-                10,  10,  10, 10, 10, 0,   0,  0,  0,   0,  0,  0,
+                0,   233, 0,  0,   0,   0,   0,  8,  8,   10, 10, 0,  0,  0,  0,   0,   0,  0,  0,
+                0,   0,   0,  0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   0,   35, 35, 0,
+                38,  0,   0,  0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   0,   0,  0,  0,
+                0,   0,   0,  0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  71, 71,  71,  71, 71, 71,
+                71,  71,  71, 71,  0,   0,   0,  0,  0,   0,  10, 10, 10, 10, 10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10, 10, 10,
+                115, 10,  10, 10,  10,  10,  10, 10, 123, 10, 10, 10, 10, 10, 10,  10,  10, 10, 10,
+                10,  135, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10,  158, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10,  177, 10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10, 10, 10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10, 10, 209,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  225, 10, 10, 10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 243, 10,  10, 10, 10,
+                10,  249, 10, 10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10, 10, 10,
+                10,  10,  10, 10,  271, 10,  10, 10, 10,  10, 10, 10, 10, 10, 281, 10,  10, 10, 10,
+                10,  10,  10, 289, 10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 304, 10,  10, 10, 10,
+                10,  10,  10, 10,  10,  10,  10, 10, 0,   0,  0,  0,  0,  0,  0,
         },
         {
-                0,   248, 0,   0,   0,   0,  0,  8,  8,   10,  10,  0,   0,  0,   0,  0,   0,  0,
-                0,   0,   0,   0,   0,   0,  0,  0,  0,   0,   0,   0,   0,  0,   0,  0,   0,  35,
-                35,  0,   38,  0,   0,   0,  0,  0,  0,   0,   0,   0,   0,  0,   0,  0,   0,  0,
-                0,   0,   0,   0,   0,   0,  0,  0,  0,   0,   0,   0,   0,  0,   0,  0,   74, 71,
-                71,  71,  71,  71,  71,  71, 71, 71, 0,   0,   0,   0,   0,  0,   10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10, 10,  10, 126,
-                10,  10,  10,  130, 131, 10, 10, 10, 10,  10,  10,  10,  10, 140, 10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  155, 10,  10, 10,  10, 10,  10, 10,
-                163, 10,  10,  10,  10,  10, 10, 10, 171, 10,  10,  10,  10, 10,  10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  210, 10, 10,  10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  226, 10,  10,  10, 10,  10, 238, 10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10, 10,  10, 10,
-                253, 10,  255, 10,  10,  10, 10, 10, 10,  10,  10,  10,  10, 266, 10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10, 10,  10, 10,
-                10,  10,  10,  10,  10,  10, 10, 10, 10,  10,  10,  10,  10, 10,  10, 10,  10, 10,
-                10,  10,  10,  0,   0,   0,  0,  0,  0,   0,
+                0,   251, 0,  0,   0,   0,   0,  8,  8,   10, 10,  0,   0,   0,   0,  0,  0,   0,
+                0,   0,   0,  0,   0,   0,   0,  0,  0,   0,  0,   0,   0,   0,   0,  0,  0,   35,
+                35,  0,   38, 0,   0,   0,   0,  0,  0,   0,  0,   0,   0,   0,   0,  0,  0,   0,
+                0,   0,   0,  0,   0,   0,   0,  0,  0,   0,  0,   0,   0,   0,   0,  0,  74,  71,
+                71,  71,  71, 71,  71,  71,  71, 71, 0,   0,  0,   0,   0,   0,   10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  10,  10,  10,  10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  10,  10,  10,  10, 10, 10,  126,
+                10,  10,  10, 130, 131, 10,  10, 10, 10,  10, 10,  10,  10,  140, 10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 155, 10,  10,  10,  10, 10, 10,  10,
+                163, 10,  10, 10,  10,  10,  10, 10, 171, 10, 10,  10,  10,  10,  10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  10,  10,  10,  10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  210, 10,  10,  10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  10,  229, 10,  10, 10, 10,  10,
+                241, 10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  10,  10,  10,  10, 10, 10,  10,
+                10,  10,  10, 256, 10,  258, 10, 10, 10,  10, 10,  10,  10,  10,  10, 10, 269, 10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  10,  10,  10,  10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  10, 10, 10,  10, 10,  10,  10,  10,  10, 10, 10,  10,
+                10,  10,  10, 10,  10,  10,  0,  0,  0,   0,  0,   0,   0,
         },
         {
-                0,   277, 0,  0,   0,   0,  0,  8,   8,   10, 10, 0,   0,   0,   0,   0,   0,  0,
-                0,   0,   0,  0,   0,   0,  0,  0,   0,   0,  0,  0,   0,   0,   0,   0,   0,  35,
-                35,  0,   38, 0,   0,   0,  0,  0,   0,   0,  0,  0,   0,   0,   0,   0,   0,  0,
-                0,   0,   0,  0,   0,   0,  0,  0,   0,   0,  0,  0,   0,   0,   0,   0,   71, 71,
-                71,  71,  71, 71,  77,  71, 71, 71,  0,   0,  0,  0,   0,   0,   10,  10,  10, 10,
-                10,  10,  10, 10,  10,  10, 10, 10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 10,
-                10,  110, 10, 10,  10,  10, 10, 10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10,  10, 10, 10,  10,  10, 10, 138, 10,  142, 141, 10,  10, 10,
-                10,  10,  10, 10,  10,  10, 10, 10,  153, 10, 10, 10,  10,  10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10,  10, 10, 10,  10,  10, 10, 10,  175, 10,  10,  10,  10, 10,
-                10,  10,  10, 10,  10,  10, 10, 188, 10,  10, 10, 10,  10,  194, 10,  10,  10, 10,
-                10,  10,  10, 10,  10,  10, 10, 10,  10,  10, 10, 10,  10,  10,  10,  214, 10, 10,
-                10,  10,  10, 220, 10,  10, 10, 10,  10,  10, 10, 10,  10,  10,  10,  244, 10, 10,
-                10,  10,  10, 10,  239, 10, 10, 10,  243, 10, 10, 10,  10,  10,  267, 10,  10, 10,
-                10,  10,  10, 10,  10,  10, 10, 10,  10,  10, 10, 10,  265, 10,  10,  10,  10, 10,
-                271, 10,  10, 274, 10,  10, 10, 10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 10,
-                10,  10,  10, 292, 10,  10, 10, 10,  10,  10, 10, 10,  10,  10,  303, 10,  10, 10,
-                10,  10,  10, 0,   0,   0,  0,  0,   0,   0,
+                0,   280, 0,  0,   0,  0,  0,   8,   8,   10, 10, 0,   0,   0,   0,   0,   0,  0,
+                0,   0,   0,  0,   0,  0,  0,   0,   0,   0,  0,  0,   0,   0,   0,   0,   0,  35,
+                35,  0,   38, 0,   0,  0,  0,   0,   0,   0,  0,  0,   0,   0,   0,   0,   0,  0,
+                0,   0,   0,  0,   0,  0,  0,   0,   0,   0,  0,  0,   0,   0,   0,   0,   71, 71,
+                71,  71,  71, 71,  77, 71, 71,  71,  0,   0,  0,  0,   0,   0,   10,  10,  10, 10,
+                10,  10,  10, 10,  10, 10, 10,  10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 10,
+                10,  110, 10, 10,  10, 10, 10,  10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 10,
+                10,  10,  10, 10,  10, 10, 10,  10,  10,  10, 10, 138, 10,  142, 141, 10,  10, 10,
+                10,  10,  10, 10,  10, 10, 10,  10,  153, 10, 10, 10,  10,  10,  10,  10,  10, 10,
+                10,  10,  10, 10,  10, 10, 10,  10,  10,  10, 10, 10,  175, 10,  10,  10,  10, 10,
+                10,  10,  10, 10,  10, 10, 10,  188, 10,  10, 10, 10,  10,  194, 10,  10,  10, 10,
+                10,  10,  10, 10,  10, 10, 10,  10,  10,  10, 10, 10,  10,  10,  10,  214, 10, 10,
+                10,  10,  10, 10,  10, 10, 223, 10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 10,
+                247, 10,  10, 10,  10, 10, 10,  242, 10,  10, 10, 246, 10,  10,  10,  10,  10, 270,
+                10,  10,  10, 10,  10, 10, 10,  10,  10,  10, 10, 10,  10,  10,  10,  268, 10, 10,
+                10,  10,  10, 274, 10, 10, 277, 10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 10,
+                10,  10,  10, 10,  10, 10, 295, 10,  10,  10, 10, 10,  10,  10,  10,  10,  10, 306,
+                10,  10,  10, 10,  10, 10, 0,   0,   0,   0,  0,  0,   0,
         },
         {
-                0,   281, 0,   0,   0,  0,  0,   8,  8,   10, 10,  0,  0,   0,  0,  0,  0,   0,
-                0,   0,   0,   0,   0,  0,  0,   0,  0,   0,  0,   0,  0,   0,  0,  0,  0,   35,
-                35,  0,   38,  0,   0,  0,  0,   0,  0,   0,  0,   0,  0,   0,  0,  0,  0,   0,
-                0,   0,   0,   0,   0,  0,  0,   0,  0,   0,  0,   0,  0,   0,  0,  0,  71,  71,
-                71,  71,  71,  71,  71, 71, 71,  71, 0,   0,  0,   0,  0,   0,  10, 10, 10,  10,
-                10,  10,  10,  10,  10, 10, 10,  10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                109, 10,  10,  10,  10, 10, 119, 10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                10,  10,  10,  10,  10, 10, 10,  10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                145, 10,  10,  10,  10, 10, 151, 10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                10,  10,  10,  166, 10, 10, 10,  10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                10,  10,  10,  10,  10, 10, 187, 10, 10,  10, 10,  10, 193, 10, 10, 10, 10,  10,
-                10,  10,  10,  202, 10, 10, 10,  10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                10,  10,  219, 10,  10, 10, 10,  10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                10,  10,  10,  10,  10, 10, 10,  10, 10,  10, 245, 10, 10,  10, 10, 10, 10,  10,
-                10,  10,  10,  10,  10, 10, 10,  10, 10,  10, 10,  10, 10,  10, 10, 10, 269, 10,
-                10,  10,  10,  10,  10, 10, 10,  10, 279, 10, 10,  10, 10,  10, 10, 10, 10,  10,
-                10,  10,  10,  10,  10, 10, 10,  10, 10,  10, 10,  10, 10,  10, 10, 10, 10,  10,
-                10,  10,  10,  0,   0,  0,  0,   0,  0,   0,
+                0,   284, 0,   0,  0,  0,   0,  8,  8,  10, 10, 0,   0,   0,   0,  0,   0,  0,   0,
+                0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   0,   0,   0,  0,   35, 35,  0,
+                38,  0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   0,   0,   0,  0,   0,  0,   0,
+                0,   0,   0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   0,   71,  71, 71,  71, 71,  71,
+                71,  71,  71,  71, 0,  0,   0,  0,  0,  0,  10, 10,  10,  10,  10, 10,  10, 10,  10,
+                10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  109, 10, 10,  10, 10,  10,
+                119, 10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10,  10, 10,  10, 10,  10,
+                10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 145, 10,  10,  10, 10,  10, 151, 10,
+                10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  166, 10, 10,  10, 10,  10,
+                10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10,  10, 187, 10, 10,  10,
+                10,  10,  193, 10, 10, 10,  10, 10, 10, 10, 10, 202, 10,  10,  10, 218, 10, 10,  10,
+                10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  222, 10,  10, 10,  10, 10,  10,
+                10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10,  10, 10,  10, 10,  10,
+                248, 10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10,  10, 10,  10, 10,  10,
+                10,  10,  10,  10, 10, 272, 10, 10, 10, 10, 10, 10,  10,  10,  10, 282, 10, 10,  10,
+                10,  10,  10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10,  10,  10, 10,  10, 10,  10,
+                10,  10,  10,  10, 10, 10,  10, 10, 0,  0,  0,  0,   0,   0,   0,
         },
         {
-                0,  288, 0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,   0,  0,  0,  0,
+                0,  291, 0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,   0,  0,  0,  0,
                 0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  35,  35, 0,  38, 0,
                 0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,
                 0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  71, 71, 71, 71, 71, 71,  71, 71, 71, 71,
@@ -916,25 +914,25 @@ static int16_t transitions[61][316] = {
                 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
                 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
                 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,   0,  0,  0,
         },
         {
-                0,  296, 0,  0,  0,  0,  0,  8,  8,   10, 10, 0,  0,  0,  0,  0,   0,  0,  0,  0,
-                0,  0,   0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  35,  35, 0,  38, 0,
-                0,  0,   0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,
-                0,  0,   0,  0,  0,  0,  0,  0,  0,   0,  71, 71, 71, 71, 75, 71,  71, 71, 71, 71,
-                0,  0,   0,  0,  0,  0,  10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 196, 10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 272, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,
-                10, 10,  10, 10, 10, 10, 10, 10, 10,  0,  0,  0,  0,  0,  0,  0,
+                0,  299, 0,  0,  0,  0,  0,  8,  8,  10, 10, 0,   0,  0,  0,  0,   0,  0,  0,  0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  35,  35, 0,  38, 0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,   0,  0,  0,  0,
+                0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  71, 71,  71, 71, 75, 71,  71, 71, 71, 71,
+                0,  0,   0,  0,  0,  0,  10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 196, 10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 275, 10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10,  10, 10, 10, 10,
+                10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  0,  0,  0,  0,   0,  0,  0,
         },
         {
                 0,  9,  0,  0,  0,  0,  0,  8,  8,  10, 10, 0,  0,  0,  0,  0,  0,  0,  0,  0,
@@ -952,28 +950,28 @@ static int16_t transitions[61][316] = {
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
                 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0,  9,  0,  0,  0,  0,  0,  8,   8,  10, 10,  0,  0,  0,  0,  0,  0,   0,  0,  0,
-                0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,   0,  0,  0,  0,  35, 35,  0,  38, 0,
-                0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,   0,  0,  0,  0,  0,  0,   0,  0,  0,
-                0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  71,  71, 71, 71, 71, 71, 71,  71, 71, 71,
-                0,  0,  0,  0,  0,  0,  10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 191, 10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 237, 10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,  10, 10, 10, 10, 10, 10,  10, 10, 10,
-                10, 10, 10, 10, 10, 10, 10, 308, 10, 0,  0,   0,  0,  0,  0,  0,
+                0,  9,  0,  0,  0,  0,  0,  8,  8,  10, 10,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  35, 35, 0,  38, 0,
+                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,
+                0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  71,  71, 71, 71, 71, 71, 71, 71, 71, 71,
+                0,  0,  0,  0,  0,  0,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 191, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 240,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 311, 10, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0, 309, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 312, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -985,25 +983,25 @@ static int16_t transitions[61][316] = {
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
-                0, 310, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 35,  35, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,   0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 312, 0,  0, 0,  0, 0,
+                0, 313, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 0, 38,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 315, 0, 0, 0, 0, 0,
         },
         {
-                0, 314, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 317, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1015,10 +1013,10 @@ static int16_t transitions[61][316] = {
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
         {
-                0, 315, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 318, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 35, 35, 0, 38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1030,26 +1028,26 @@ static int16_t transitions[61][316] = {
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                 0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0,
+                0, 0,   0, 0, 0, 0, 0, 0, 0, 0, 0,  0,  0, 0,  0, 0, 0, 0, 0,
         },
 };
 
-static int8_t accepts[316] = {
-        -1, -1, 97, 97, 100, 71, 77, 100, 45, 44, 44, 61, 86, 66, 70, 94, 91, 47, 48, 59, 84, 57,
-        55, 82, 54, 58, 56,  83, 96, 53,  1,  -1, -1, 1,  60, -1, -1, 99, 98, 85, 2,  1,  1,  -1,
-        -1, 1,  -1, -1, 1,   2,  -1, -1,  1,  -1, 2,  2,  74, 73, 95, 79, 62, 87, 81, 75, 76, 78,
-        80, 63, 88, 72, 100, 46, 46, 6,   46, 46, 46, 46, 46, 12, 51, 52, 65, 90, 69, 93, 44, 44,
-        44, 44, 44, 44, 44,  44, 44, 44,  44, 44, 44, 44, 44, 36, 44, 44, 44, 44, 44, 37, 44, 44,
-        44, 44, 44, 38, 44,  44, 44, 44,  15, 44, 44, 44, 44, 34, 44, 44, 44, 13, 44, 44, 44, 43,
-        44, 44, 44, 44, 44,  44, 31, 44,  44, 23, 44, 44, 44, 44, 16, 44, 44, 44, 44, 44, 44, 14,
-        44, 44, 44, 44, 44,  17, 10, 44,  44, 44, 7,  44, 44, 42, 44, 44, 44, 44, 4,  44, 44, 27,
-        44, 8,  44, 44, 44,  44, 26, 44,  5,  19, 44, 44, 21, 44, 44, 44, 44, 44, 40, 44, 44, 24,
-        44, 44, 44, 44, 44,  44, 25, 44,  44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 28, 44, 44,
-        20, 44, 44, 44, 44,  44, 44, 44,  44, 41, 44, 44, 44, 44, 44, 44, 44, 29, 44, 44, 44, 44,
-        44, 33, 44, 44, 44,  18, 44, 44,  44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
-        44, 44, 35, 44, 44,  44, 44, 39,  44, 44, 44, 44, 11, 44, 44, 44, 3,  44, 44, 44, 44, 44,
-        44, 22, 44, 44, 44,  44, 44, 44,  44, 32, 44, 44, 44, 44, 9,  44, 44, 44, 44, 44, 44, 44,
-        30, 49, 64, 89, 68,  92, 50, 67,
+static int8_t accepts[319] = {
+        -1, -1, 98, 98, 101, 72, 78, 101, 46, 45, 45, 62, 87, 67, 71, 95,  92, 48, 49, 60, 85, 58,
+        56, 83, 55, 59, 57,  84, 97, 54,  1,  -1, -1, 1,  61, -1, -1, 100, 99, 86, 2,  1,  1,  -1,
+        -1, 1,  -1, -1, 1,   2,  -1, -1,  1,  -1, 2,  2,  75, 74, 96, 80,  63, 88, 82, 76, 77, 79,
+        81, 64, 89, 73, 101, 47, 47, 6,   47, 47, 47, 47, 47, 12, 52, 53,  66, 91, 70, 94, 45, 45,
+        45, 45, 45, 45, 45,  45, 45, 45,  45, 45, 45, 45, 45, 37, 45, 45,  45, 45, 45, 38, 45, 45,
+        45, 45, 45, 39, 45,  45, 45, 45,  15, 45, 45, 45, 45, 35, 45, 45,  45, 13, 45, 45, 45, 44,
+        45, 45, 45, 45, 45,  45, 32, 45,  45, 24, 45, 45, 45, 45, 16, 45,  45, 45, 45, 45, 45, 14,
+        45, 45, 45, 45, 45,  17, 10, 45,  45, 45, 7,  45, 45, 43, 45, 45,  45, 45, 4,  45, 45, 28,
+        45, 8,  45, 45, 45,  45, 27, 45,  5,  20, 45, 45, 22, 45, 45, 45,  45, 45, 41, 45, 45, 25,
+        45, 45, 45, 45, 45,  45, 26, 45,  45, 45, 45, 45, 45, 45, 45, 45,  45, 45, 45, 29, 45, 45,
+        19, 45, 45, 21, 45,  45, 45, 45,  45, 45, 45, 45, 42, 45, 45, 45,  45, 45, 45, 45, 30, 45,
+        45, 45, 45, 45, 34,  45, 45, 45,  18, 45, 45, 45, 45, 45, 45, 45,  45, 45, 45, 45, 45, 45,
+        45, 45, 45, 45, 45,  36, 45, 45,  45, 45, 40, 45, 45, 45, 45, 11,  45, 45, 45, 3,  45, 45,
+        45, 45, 45, 45, 23,  45, 45, 45,  45, 45, 45, 45, 33, 45, 45, 45,  45, 9,  45, 45, 45, 45,
+        45, 45, 45, 31, 50,  65, 90, 69,  93, 51, 68,
 };
 
 Token Lexer::next() {
@@ -1079,4 +1077,4 @@ Token Lexer::next() {
     return Token(kind, startOffset, fOffset - startOffset);
 }
 
-}  // namespace
+}  // namespace SkSL
diff --git a/src/sksl/SkSLLexer.h b/src/sksl/SkSLLexer.h
index 0ad8d265856ad..bffaa6e05b368 100644
--- a/src/sksl/SkSLLexer.h
+++ b/src/sksl/SkSLLexer.h
@@ -53,6 +53,8 @@ struct Token {
         DISCARD,
 #undef RETURN
         RETURN,
+#undef NULL_LITERAL
+        NULL_LITERAL,
 #undef IN
         IN,
 #undef OUT
@@ -245,5 +247,5 @@ class Lexer {
     int32_t fOffset;
 };
 
-}  // namespace
+}  // namespace SkSL
 #endif
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index 3cf0b7fe3cc7c..6d8e62e8ef134 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -29,6 +29,7 @@
 #include "ast/SkSLASTInterfaceBlock.h"
 #include "ast/SkSLASTIntLiteral.h"
 #include "ast/SkSLASTModifiersDeclaration.h"
+#include "ast/SkSLASTNullLiteral.h"
 #include "ast/SkSLASTParameter.h"
 #include "ast/SkSLASTPrefixExpression.h"
 #include "ast/SkSLASTReturnStatement.h"
@@ -517,7 +518,7 @@ std::unique_ptr<ASTType> Parser::structDeclaration() {
     fTypes.add(this->text(name), std::unique_ptr<Type>(new Type(name.fOffset, this->text(name),
                                                                 fields)));
     return std::unique_ptr<ASTType>(new ASTType(name.fOffset, this->text(name),
-                                                ASTType::kStruct_Kind, std::vector<int>()));
+                                                ASTType::kStruct_Kind, std::vector<int>(), false));
 }
 
 /* structDeclaration ((IDENTIFIER varDeclarationEnd) | SEMICOLON) */
@@ -1071,7 +1072,7 @@ std::unique_ptr<ASTStatement> Parser::statement() {
     }
 }
 
-/* IDENTIFIER(type) (LBRACKET intLiteral? RBRACKET)* */
+/* IDENTIFIER(type) (LBRACKET intLiteral? RBRACKET)* QUESTION? */
 std::unique_ptr<ASTType> Parser::type() {
     Token type;
     if (!this->expect(Token::IDENTIFIER, "a type", &type)) {
@@ -1095,8 +1096,9 @@ std::unique_ptr<ASTType> Parser::type() {
         }
         this->expect(Token::RBRACKET, "']'");
     }
+    bool nullable = this->checkNext(Token::QUESTION);
     return std::unique_ptr<ASTType>(new ASTType(type.fOffset, this->text(type),
-                                                ASTType::kIdentifier_Kind, sizes));
+                                                ASTType::kIdentifier_Kind, sizes, nullable));
 }
 
 /* IDENTIFIER LBRACE varDeclaration* RBRACE (IDENTIFIER (LBRACKET expression? RBRACKET)*)? */
@@ -1917,7 +1919,7 @@ std::unique_ptr<ASTSuffix> Parser::suffix() {
     }
 }
 
-/* IDENTIFIER | intLiteral | floatLiteral | boolLiteral | '(' expression ')' */
+/* IDENTIFIER | intLiteral | floatLiteral | boolLiteral | NULL_LITERAL | '(' expression ')' */
 std::unique_ptr<ASTExpression> Parser::term() {
     std::unique_ptr<ASTExpression> result;
     Token t = this->peek();
@@ -1951,6 +1953,10 @@ std::unique_ptr<ASTExpression> Parser::term() {
             }
             break;
         }
+        case Token::NULL_LITERAL:
+            this->nextToken();
+            result.reset(new ASTNullLiteral(t.fOffset));
+            break;
         case Token::LPAREN: {
             this->nextToken();
             result = this->expression();
diff --git a/src/sksl/ast/SkSLASTExpression.h b/src/sksl/ast/SkSLASTExpression.h
index 0d8ddc781f7b2..edcb09d918523 100644
--- a/src/sksl/ast/SkSLASTExpression.h
+++ b/src/sksl/ast/SkSLASTExpression.h
@@ -17,13 +17,14 @@ namespace SkSL {
  */
 struct ASTExpression : public ASTPositionNode {
     enum Kind {
+        kBinary_Kind,
+        kBool_Kind,
         kFloat_Kind,
         kIdentifier_Kind,
         kInt_Kind,
-        kBool_Kind,
+        kNull_Kind,
         kPrefix_Kind,
         kSuffix_Kind,
-        kBinary_Kind,
         kTernary_Kind
     };
 
diff --git a/src/sksl/ast/SkSLASTNullLiteral.h b/src/sksl/ast/SkSLASTNullLiteral.h
new file mode 100644
index 0000000000000..7d16d70ada2cb
--- /dev/null
+++ b/src/sksl/ast/SkSLASTNullLiteral.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SKSL_ASTNULLLITERAL
+#define SKSL_ASTNULLLITERAL
+
+#include "SkSLASTExpression.h"
+
+namespace SkSL {
+
+/**
+ * Represents "null".
+ */
+struct ASTNullLiteral : public ASTExpression {
+    ASTNullLiteral(int offset)
+    : INHERITED(offset, kNull_Kind) {}
+
+    String description() const override {
+        return "null";
+    }
+
+    typedef ASTExpression INHERITED;
+};
+
+} // namespace
+
+#endif
diff --git a/src/sksl/ast/SkSLASTType.h b/src/sksl/ast/SkSLASTType.h
index 44fd95bdc746b..52ada8405a7a1 100644
--- a/src/sksl/ast/SkSLASTType.h
+++ b/src/sksl/ast/SkSLASTType.h
@@ -21,11 +21,12 @@ struct ASTType : public ASTPositionNode {
         kStruct_Kind
     };
 
-    ASTType(int offset, StringFragment name, Kind kind, std::vector<int> sizes)
+    ASTType(int offset, StringFragment name, Kind kind, std::vector<int> sizes, bool nullable)
     : INHERITED(offset)
     , fName(name)
     , fKind(kind)
-    , fSizes(std::move(sizes)) {}
+    , fSizes(std::move(sizes))
+    , fNullable(nullable) {}
 
     String description() const override {
         return fName;
@@ -38,6 +39,8 @@ struct ASTType : public ASTPositionNode {
     // array sizes, -1 meaning unspecified
     const std::vector<int> fSizes;
 
+    bool fNullable;
+
     typedef ASTPositionNode INHERITED;
 };
 
diff --git a/src/sksl/ir/SkSLExpression.h b/src/sksl/ir/SkSLExpression.h
index ddeed448a2640..126f3a01d5a77 100644
--- a/src/sksl/ir/SkSLExpression.h
+++ b/src/sksl/ir/SkSLExpression.h
@@ -35,6 +35,7 @@ struct Expression : public IRNode {
         kFunctionReference_Kind,
         kFunctionCall_Kind,
         kIndex_Kind,
+        kNullLiteral_Kind,
         kPrefix_Kind,
         kPostfix_Kind,
         kSetting_Kind,
diff --git a/src/sksl/ir/SkSLNullLiteral.h b/src/sksl/ir/SkSLNullLiteral.h
new file mode 100644
index 0000000000000..8728b17296ce3
--- /dev/null
+++ b/src/sksl/ir/SkSLNullLiteral.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SKSL_NULLLITERAL
+#define SKSL_NULLLITERAL
+
+#include "SkSLContext.h"
+#include "SkSLExpression.h"
+
+namespace SkSL {
+
+/**
+ * Represents 'null'.
+ */
+struct NullLiteral : public Expression {
+    NullLiteral(const Context& context, int offset)
+    : INHERITED(offset, kNullLiteral_Kind, *context.fNull_Type) {}
+
+    NullLiteral(int offset, const Type& type)
+    : INHERITED(offset, kNullLiteral_Kind, type) {}
+
+    String description() const override {
+        return "null";
+    }
+
+    bool hasSideEffects() const override {
+        return false;
+    }
+
+    bool isConstant() const override {
+        return true;
+    }
+
+    bool compareConstant(const Context& context, const Expression& other) const override {
+        return true;
+    }
+
+    std::unique_ptr<Expression> clone() const override {
+        return std::unique_ptr<Expression>(new NullLiteral(fOffset, fType));
+    }
+
+    typedef Expression INHERITED;
+};
+
+} // namespace
+
+#endif
diff --git a/src/sksl/ir/SkSLType.cpp b/src/sksl/ir/SkSLType.cpp
index 691ff7b73d580..a3d5c5994028d 100644
--- a/src/sksl/ir/SkSLType.cpp
+++ b/src/sksl/ir/SkSLType.cpp
@@ -14,6 +14,16 @@ int Type::coercionCost(const Type& other) const {
     if (*this == other) {
         return 0;
     }
+    if (this->kind() == kNullable_Kind && other.kind() != kNullable_Kind) {
+        int result = this->componentType().coercionCost(other);
+        if (result != INT_MAX) {
+            ++result;
+        }
+        return result;
+    }
+    if (this->fName == "null" && other.kind() == kNullable_Kind) {
+        return 0;
+    }
     if (this->kind() == kVector_Kind && other.kind() == kVector_Kind) {
         if (this->columns() == other.columns()) {
             return this->componentType().coercionCost(other.componentType());
diff --git a/src/sksl/ir/SkSLType.h b/src/sksl/ir/SkSLType.h
index ba97e63914acd..b8e336d02ff48 100644
--- a/src/sksl/ir/SkSLType.h
+++ b/src/sksl/ir/SkSLType.h
@@ -45,6 +45,7 @@ class Type : public Symbol {
         kArray_Kind,
         kEnum_Kind,
         kGeneric_Kind,
+        kNullable_Kind,
         kMatrix_Kind,
         kOther_Kind,
         kSampler_Kind,
@@ -144,6 +145,20 @@ class Type : public Symbol {
         fName.fLength = fNameString.size();
     }
 
+    // Create a nullable type.
+    Type(String name, Kind kind, const Type& componentType)
+    : INHERITED(-1, kType_Kind, StringFragment())
+    , fNameString(std::move(name))
+    , fTypeKind(kind)
+    , fNumberKind(kNonnumeric_NumberKind)
+    , fComponentType(&componentType)
+    , fColumns(1)
+    , fRows(1)
+    , fDimensions(SpvDim1D) {
+        fName.fChars = fNameString.c_str();
+        fName.fLength = fNameString.size();
+    }
+
     // Create a vector type.
     Type(const char* name, const Type& componentType, int columns)
     : Type(name, kVector_Kind, componentType, columns) {}
@@ -288,6 +303,16 @@ class Type : public Symbol {
         return *fComponentType;
     }
 
+    /**
+     * For nullable types, returns the base type, otherwise returns the type itself.
+     */
+    const Type& nonnullable() const {
+        if (fTypeKind == kNullable_Kind) {
+            return this->componentType();
+        }
+        return *this;
+    }
+
     /**
      * For matrices and vectors, returns the number of columns (e.g. both mat3 and float3return 3).
      * For scalars, returns 1. For arrays, returns either the size of the array (if known) or -1.
diff --git a/src/sksl/lex/DFAState.h b/src/sksl/lex/DFAState.h
index ae5aa4e95b39f..01d34a4356707 100644
--- a/src/sksl/lex/DFAState.h
+++ b/src/sksl/lex/DFAState.h
@@ -58,7 +58,7 @@ struct DFAState {
 namespace std {
     template<> struct hash<DFAState::Label> {
         size_t operator()(const DFAState::Label& s) const {
-            int result = 0;
+            size_t result = 0;
             for (int i : s.fStates) {
                 result = result * 101 + i;
             }
diff --git a/src/sksl/lex/sksl.lex b/src/sksl/lex/sksl.lex
index f5ba759a79afb..20ace806a1417 100644
--- a/src/sksl/lex/sksl.lex
+++ b/src/sksl/lex/sksl.lex
@@ -16,6 +16,7 @@ BREAK          = "break"
 CONTINUE       = "continue"
 DISCARD        = "discard"
 RETURN         = "return"
+NULL_LITERAL   = "null"
 IN             = "in"
 OUT            = "out"
 INOUT          = "inout"
diff --git a/src/sksl/sksl_fp.inc b/src/sksl/sksl_fp.inc
index 7a3963d3527d2..a1deaca516b80 100644
--- a/src/sksl/sksl_fp.inc
+++ b/src/sksl/sksl_fp.inc
@@ -25,4 +25,6 @@ layout(builtin=10012) half sk_Height;
 
 half4 process(fragmentProcessor fp);
 half4 process(fragmentProcessor fp, half4 input);
+half4 process(fragmentProcessor? fp);
+half4 process(fragmentProcessor? fp, half4 input);
 )
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index 8fadcf35b24e5..9efe08fbe4b3f 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -469,11 +469,11 @@ DEF_TEST(SkSLFPChildProcessors, r) {
          },
          {
             "SkString _child0(\"_child0\");",
-            "this->emitChild(0, &_child0, args);",
+            "this->emitChild(_outer.child1_index(), &_child0, args);",
             "SkString _child1(\"_child1\");",
-            "this->emitChild(1, &_child1, args);",
-            "this->registerChildProcessor(src.childProcessor(0).clone());",
-            "this->registerChildProcessor(src.childProcessor(1).clone());"
+            "this->emitChild(_outer.child2_index(), &_child1, args);",
+            "this->registerChildProcessor(src.childProcessor(fChild1_index).clone());",
+            "this->registerChildProcessor(src.childProcessor(fChild2_index).clone());"
          });
 }
 
@@ -495,12 +495,12 @@ DEF_TEST(SkSLFPChildProcessorsWithInput, r) {
          {
             "SkString _input0(\"childIn\");",
             "SkString _child0(\"_child0\");",
-            "this->emitChild(0, _input0.c_str(), &_child0, args);",
+            "this->emitChild(_outer.child1_index(), _input0.c_str(), &_child0, args);",
             "SkString _input1(\"childOut1\");",
             "SkString _child1(\"_child1\");",
-            "this->emitChild(1, _input1.c_str(), &_child1, args);",
-            "this->registerChildProcessor(src.childProcessor(0).clone());",
-            "this->registerChildProcessor(src.childProcessor(1).clone());"
+            "this->emitChild(_outer.child2_index(), _input1.c_str(), &_child1, args);",
+            "this->registerChildProcessor(src.childProcessor(fChild1_index).clone());",
+            "this->registerChildProcessor(src.childProcessor(fChild2_index).clone());"
          });
 }
 
@@ -517,8 +517,8 @@ DEF_TEST(SkSLFPChildProcessorWithInputExpression, r) {
          {
             "SkString _input0 = SkStringPrintf(\"%s * half4(0.5)\", args.fInputColor);",
             "SkString _child0(\"_child0\");",
-            "this->emitChild(0, _input0.c_str(), &_child0, args);",
-            "this->registerChildProcessor(src.childProcessor(0).clone());",
+            "this->emitChild(_outer.child_index(), _input0.c_str(), &_child0, args);",
+            "this->registerChildProcessor(src.childProcessor(fChild_index).clone());",
          });
 }
 
@@ -537,12 +537,12 @@ DEF_TEST(SkSLFPNestedChildProcessors, r) {
          {
             "SkString _input0 = SkStringPrintf(\"%s * half4(0.5)\", args.fInputColor);",
             "SkString _child0(\"_child0\");",
-            "this->emitChild(0, _input0.c_str(), &_child0, args);",
+            "this->emitChild(_outer.child1_index(), _input0.c_str(), &_child0, args);",
             "SkString _input1 = SkStringPrintf(\"%s * %s\", args.fInputColor, _child0.c_str());",
             "SkString _child1(\"_child1\");",
-            "this->emitChild(1, _input1.c_str(), &_child1, args);",
-            "this->registerChildProcessor(src.childProcessor(0).clone());",
-            "this->registerChildProcessor(src.childProcessor(1).clone());"
+            "this->emitChild(_outer.child2_index(), _input1.c_str(), &_child1, args);",
+            "this->registerChildProcessor(src.childProcessor(fChild1_index).clone());",
+            "this->registerChildProcessor(src.childProcessor(fChild2_index).clone());"
          });
 }
 
@@ -567,10 +567,10 @@ DEF_TEST(SkSLFPChildFPAndGlobal, r) {
                     "(hasCap ? \"true\" : \"false\"));",
             "SkString _input0 = SkStringPrintf(\"%s\", args.fInputColor);",
             "SkString _child0(\"_child0\");",
-            "this->emitChild(0, _input0.c_str(), &_child0, args);",
+            "this->emitChild(_outer.child_index(), _input0.c_str(), &_child0, args);",
             "fragBuilder->codeAppendf(\"\\n    %s = %s;\\n} else {\\n    %s = half4(1.0);\\n}"
                     "\\n\", args.fOutputColor, _child0.c_str(), args.fOutputColor);",
-            "this->registerChildProcessor(src.childProcessor(0).clone());"
+            "this->registerChildProcessor(src.childProcessor(fChild_index).clone());"
          });
 }
 
@@ -590,13 +590,14 @@ DEF_TEST(SkSLFPChildProcessorInlineFieldAccess, r) {
          },
          {
             "fragBuilder->codeAppendf(\"if (%s) {\", "
-                    "(_outer.childProcessor(0).preservesOpaqueInput() ? \"true\" : \"false\"));",
+                    "(_outer.childProcessor(_outer.child_index()).preservesOpaqueInput() ? "
+                    "\"true\" : \"false\"));",
             "SkString _input0 = SkStringPrintf(\"%s\", args.fInputColor);",
             "SkString _child0(\"_child0\");",
-            "this->emitChild(0, _input0.c_str(), &_child0, args);",
+            "this->emitChild(_outer.child_index(), _input0.c_str(), &_child0, args);",
             "fragBuilder->codeAppendf(\"\\n    %s = %s;\\n} else {\\n    %s = half4(1.0);\\n}\\n\""
                     ", args.fOutputColor, _child0.c_str(), args.fOutputColor);",
-            "this->registerChildProcessor(src.childProcessor(0).clone());"
+            "this->registerChildProcessor(src.childProcessor(fChild_index).clone());"
          });
 }
 
@@ -616,13 +617,13 @@ DEF_TEST(SkSLFPChildProcessorFieldAccess, r) {
             "this->registerChildProcessor(std::move(child));"
          },
          {
-            "opaque = _outer.childProcessor(0).preservesOpaqueInput();",
+            "opaque = _outer.childProcessor(_outer.child_index()).preservesOpaqueInput();",
             "fragBuilder->codeAppendf(\"bool opaque = %s;\\nif (opaque) {\", "
                     "(opaque ? \"true\" : \"false\"));",
             "SkString _child0(\"_child0\");",
-            "this->emitChild(0, &_child0, args);",
+            "this->emitChild(_outer.child_index(), &_child0, args);",
             "fragBuilder->codeAppendf(\"\\n    %s = %s;\\n} else {\\n    %s = half4(0.5);\\n}\\n\""
                     ", args.fOutputColor, _child0.c_str(), args.fOutputColor);",
-            "this->registerChildProcessor(src.childProcessor(0).clone());"
+            "this->registerChildProcessor(src.childProcessor(fChild_index).clone());"
          });
 }