finish the local version

publish cp-1.6.4
publish common-1.5.9

.gitignore

@@ -1,4 +1,5 @@
 /build/
+/testoutput/
 */build/*
 # Compiled class file
 *.class

build.gradle

@@ -1,8 +1,19 @@
 plugins {
     id 'java'
     id 'java-library'
+    id 'maven-publish'
+    id 'signing'
+    id 'com.github.johnrengelman.shadow' version '4.0.2'
 }
 
+shadowJar {
+    classifier = "jar"
+    dependencies {
+        include(dependency(fileTree(dir: 'lib', include: '*.jar')))
+//        exclude(dependency('com.google.code.gson:gson:2.8.6'))
+//        relocate 'com.google.code.gson', 'irs.com.google.code.gson'
+    }
+}
 sourceSets {
     main {
         java {
@@ -24,23 +35,23 @@ sourceSets {
 sourceCompatibility = 1.8
 
 dependencies {
-    api project(":gmhelper")
+    api 'org.bdware.bdcontract:gmhelper:0.2.0'
-
     api 'berkeleydb:je:3.2.76'
-    api 'com.fifesoft:rsyntaxtextarea:3.1.3'
+    //   api 'com.fifesoft:rsyntaxtextarea:3.1.3'
     api 'commons-io:commons-io:2.11.0'
-    api 'io.netty:netty-all:4.1.63.Final'
+    api 'io.netty:netty-all:4.1.77.Final'
     api 'org.antlr:antlr4:4.9.2'
     api 'commons-codec:commons-codec:1.5'
-    api 'org.apache.logging.log4j:log4j-core:2.17.0'
+    api 'org.apache.logging.log4j:log4j-core:2.17.2'
-    api 'org.apache.logging.log4j:log4j-api:2.17.0'
+    api 'org.apache.logging.log4j:log4j-api:2.17.2'
     //api 'org.apache.velocity:velocity-engine-core:2.3'
-    api 'org.rocksdb:rocksdbjni:6.22.1'
+    api 'org.rocksdb:rocksdbjni:7.3.1'
-
+    // api fileTree(dir: 'lib', include: '*.jar')
-    api fileTree(dir: 'lib', include: '*.jar')
-
     testImplementation 'junit:junit:4.13.2'
+    implementation 'org.bdware.doip:doip-audit-tool:1.1.2'
 }
+group = "org.bdware.sc"
+version = "1.6.3"
 
 tasks.processResources.setDuplicatesStrategy(DuplicatesStrategy.INCLUDE)
 
@@ -54,3 +65,87 @@ task copyJar(type: Copy) {
     into "./build/output/"
     rename { String fileName -> "yjs.jar" }
 }
+//task classJar(type: Jar, dependsOn: classes) {
+//    classifier = "jar"
+//}
+tasks.withType(Copy).all {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+tasks.withType(Jar).all {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+task sourceJar(type: Jar, dependsOn: classes) {
+    archiveClassifier = "sources"
+    classifier = "sources"
+    from sourceSets.main.allSource
+}
+tasks.withType(Javadoc) {
+    options.addStringOption('Xdoclint:none', '-quiet')
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    archiveClassifier = 'javadoc'
+    classifier = "javadoc"
+    exclude { details -> details.file.getAbsolutePath().contains("/gm/")
+    }
+    from javadoc.destinationDir
+}
+
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            groupId project.group
+            artifactId "common"
+            version "${version}"
+            from components.java
+            artifact sourceJar
+            artifact javadocJar
+            artifact shadowJar
+            pom {
+                name = "bdware-common"
+                description = "common"
+                url = "https://gitee.com/BDWare/common"
+                licenses {
+                    license {
+                        name = "Mulan PSL v2"
+                        url = "http://license.coscl.org.cn/MulanPSL2"
+                    }
+                }
+                developers {
+                    developer {
+                        id = "dataware"
+                        email = "caihq@pku.edu.cn"
+                    }
+                }
+                scm {
+                    connection = "scm:git:https://gitee.com/BDWare/common.git"
+                    developerConnection = "scm:git:https://gitee.com/BDWare/common.git"
+                    url = "https://gitee.com/BDWare/common"
+                }
+            }
+
+        }
+    }
+    repositories {
+        maven {
+            name 'bdwareSnapshotRepository'
+            url 'https://oss.sonatype.org/content/repositories/snapshots'
+//            credentials {
+//                username = "${NEXUS_USERNAME}"
+//                password = "${NEXUS_PASSWORD}"
+//            }
+        }
+        maven {
+            name 'bdwareRepository'
+            url 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+//            credentials {
+//                username = "${NEXUS_USERNAME}"
+//                password = "${NEXUS_PASSWORD}"
+//            }
+        }
+    }
+}
+signing {
+    sign publishing.publications.mavenJava
+}

src/main/base/org/bdware/sc/ComponedContractResult.java

@@ -45,19 +45,18 @@ public class ComponedContractResult {
             LOGGER.info("加入一个节点的执行结果是Error!该节点下线!");
             return;
         }
-
         ContractResult cr2;
         try {
-
             cr2 = JsonUtil.fromJson(obj.get("data").getAsString(), ContractResult.class);
             if (cr2.status == ContractResult.Status.Error
                     && cr2.result.getAsString().equals(EXPIRED_REQ)) {
                 return;
             }
         } catch (Exception e) {
+            String str = null;
             cr2 =
                     new ContractResult(
-                            ContractResult.Status.Error, new JsonPrimitive("parse str failed:"));
+                            ContractResult.Status.Error, new JsonPrimitive("parse str failed:" + obj.toString()));
             e.printStackTrace();
         }
         // if (cr2.status == ContractResult.Status.Error) { // 结果不是Success不参与最终结果计算
@@ -122,7 +121,7 @@ public class ComponedContractResult {
     }
 
     public ContractResult mergeFinalResult() {
-        LOGGER.info("mergeFinalResult");
+//        LOGGER.info("mergeFinalResult");
 
         Map<JsonElement, Integer> map = new ConcurrentHashMap<>(); // <结果，出现次数>
 

src/main/base/org/bdware/sc/ContractGenerator.txt

@@ -0,0 +1,61 @@
+package org.bdware.sc;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContractGenerator {
+    static VelocityEngine ve = init();
+
+    public static String generateAPIContract(long availableDate, String url, String method, Map<String, String> header,
+                                             Map<String, String> arg) {
+        VelocityContext ctx = new VelocityContext();
+
+        Template script = ve.getTemplate("org/bdware/sc/sc/datacontract.vm");
+        String[][] initList = {{"availableDate", availableDate + ""}, {"baseUrl", stringify(url)},
+                {"method", stringify(method)}, {"headers", convertMap(header)}, {"arg", convertMap(arg)}};
+        ctx.put("initList", initList);
+        ctx.put("validate", "YancloudUtil.currentTimeMillis()>Global.availableDate");
+        ctx.put("validateFailedMsg", "\"key expired\"");
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static VelocityEngine init() {
+        VelocityEngine ve = new VelocityEngine();
+        ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
+        ve.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
+        ve.init();
+        return ve;
+    }
+
+    public static String generateFTPContract(long availableDate) {
+        VelocityContext ctx = new VelocityContext();
+        Template script = ve.getTemplate("org/bdware/sc/sc/ftpcontract.vm");
+        String[][] initList = {{"availableDate", availableDate + ""}};
+        ctx.put("initList", initList);
+        ctx.put("validate", "YancloudUtil.currentTimeMillis()>Global.availableDate");
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static String stringify(String url) {
+        return JsonUtil.toJson(url);
+    }
+
+    private static String convertMap(Map<String, String> arg) {
+        if (arg == null) {
+            arg = new HashMap<>();
+        }
+        return JsonUtil.toJson(arg);
+    }
+}

src/main/base/org/bdware/sc/ContractPort.java

@@ -111,7 +111,7 @@ public class ContractPort {
         KeyValueDBUtil.instance.setValue(CMTables.ContractInfo.toString(), USED_PORTS, JsonUtil.toJson(usedPorts));
     }
 
-    interface PortVisitor {
+    public interface PortVisitor {
         /**
          * check if the port is listened
          *
@@ -119,5 +119,6 @@ public class ContractPort {
          * @return whether some program listens to the port
          */
         boolean visit(int port);
+        boolean visit(String host,int port);
     }
 }

src/main/base/org/bdware/sc/ContractResult.java

@@ -26,6 +26,10 @@ public class ContractResult {
     }
 
     public enum Status {
-        Success, Exception, Error, Executing
+        Success, Exception, Error;
+        public Status merge(Status status) {
+            if (status == null) status = Error;
+            return this.ordinal() < status.ordinal() ? status : this;
+        }
     }
 }

src/main/base/org/bdware/sc/DX.java.txt

@@ -0,0 +1,44 @@
+package org.bdware.sc;
+
+import com.android.dx.cf.direct.DirectClassFile;
+import com.android.dx.cf.direct.StdAttributeFactory;
+import com.android.dx.command.dexer.DxContext;
+import com.android.dx.dex.DexOptions;
+import com.android.dx.dex.cf.CfOptions;
+import com.android.dx.dex.cf.CfTranslator;
+import com.android.dx.dex.file.ClassDefItem;
+import com.android.dx.dex.file.DexFile;
+
+import java.util.Map;
+
+public class DX {
+    public static byte[] clzsToDex(Map<String, byte[]> clzs) {
+        try {
+            DxContext context = new DxContext();
+            DexOptions dexOptions = new DexOptions();
+            dexOptions.minSdkVersion = 26;
+            CfOptions cfOptions = new CfOptions();
+            DexFile outputDex = new DexFile(dexOptions);
+            for (String str : clzs.keySet()) {
+                DirectClassFile dcf =
+                        new DirectClassFile(
+                                clzs.get(str),
+                                toInternalName(str) + ".class",
+                                cfOptions.strictNameCheck);
+                dcf.setAttributeFactory(StdAttributeFactory.THE_ONE);
+                ClassDefItem item =
+                        CfTranslator.translate(
+                                context, dcf, clzs.get(str), cfOptions, dexOptions, outputDex);
+                outputDex.add(item);
+            }
+            return outputDex.toDex(null, false);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static String toInternalName(String plain) {
+        return plain.replaceAll("\\.", "/");
+    }
+}

src/main/base/org/bdware/sc/JSEngine.java

@@ -21,4 +21,5 @@ public abstract class JSEngine implements ScriptEngine {
      */
     public abstract ContractResult loadContract(
             Contract contract, ContractNode contractNode, boolean isInsnLim);
+
 }

src/main/base/org/bdware/sc/conn/ByteUtil.java

@@ -80,6 +80,14 @@ public class ByteUtil {
         }
     }
 
+    public static boolean readBoolean(ByteArrayInputStream bi) {
+        return bi.read() == 0x01;
+    }
+
+    public static void writeBoolean(ByteArrayOutputStream bo, boolean b) {
+        bo.write(b ? 0x01 : 0x00);
+    }
+
     public static byte[] readBytes(ByteArrayInputStream bi, int len) {
         byte[] ret = new byte[len];
         bi.read(ret, 0, len);

src/main/base/org/bdware/sc/conn/ServiceServer.java

@@ -25,7 +25,7 @@ public class ServiceServer extends Thread {
     public static final ExecutorService executor =
             new ThreadPoolExecutor(
                     8,
-                    15,
+                    Integer.MAX_VALUE,
                     60,
                     TimeUnit.SECONDS,
                     new SynchronousQueue<>());
@@ -55,11 +55,10 @@ public class ServiceServer extends Thread {
 
     public void run() {
         EventLoopGroup bossGroup = new NioEventLoopGroup(1);
-        EventLoopGroup workerGroup = new NioEventLoopGroup();
 
         ServerBootstrap b = new ServerBootstrap();
         b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-        b.group(bossGroup, workerGroup)
+        b.group(bossGroup)
                 .channel(NioServerSocketChannel.class)
                 .option(ChannelOption.SO_BACKLOG, 100)
                 .option(ChannelOption.SO_REUSEADDR, false)
@@ -67,6 +66,7 @@ public class ServiceServer extends Thread {
                         new ChannelInitializer<SocketChannel>() {
                             @Override
                             protected void initChannel(SocketChannel arg0) {
+                                LOGGER.info("Connected:" + arg0.remoteAddress() + " " + arg0.localAddress());
                                 arg0.pipeline()
                                         .addLast(new LengthFieldBasedFrameCodec())
                                         .addLast(new AsyncInboundHandler(ServiceServer.this));

src/main/base/org/bdware/sc/conn/SocketGet.java

@@ -165,13 +165,12 @@ public class SocketGet {
 
     public void asyncGet(String pkgName, String method, String arg, ResultCallback cb) {
         try {
-            long id = random.nextLong();
+            long id;
-            if (!r.waitObj.containsKey(id) && null != cb) {
+            for (id = random.nextLong(); r.waitObj.containsKey(id); id = random.nextLong()) ;
+            if (cb != null) {
                 r.waitObj.put(id, cb);
-            } else {
+                r.sleep(id, cb);
-                LOGGER.warn("id conflict! " + id);
             }
-            r.sleep(id, cb);
             request(pkgName, method, arg, id);
         } catch (Exception e) {
             e.printStackTrace();

src/main/base/org/bdware/sc/event/REvent.java

@@ -17,6 +17,7 @@ public class REvent extends SM2Verifiable implements Serializable {
     private String sender;
     private REventSemantics semantics = REventSemantics.AT_LEAST_ONCE;
     private boolean forward = true;
+    private String center;
 
     public REvent(String topic, REventType type, String content, String requestID) {
         this.topic = topic;
@@ -37,13 +38,6 @@ public class REvent extends SM2Verifiable implements Serializable {
         return content;
     }
 
-    public boolean isForward() {
-        return forward;
-    }
-
-    public void setForward(boolean forward) {
-        this.forward = forward;
-    }
 
     public String getHash() {
         return hash;
@@ -73,6 +67,22 @@ public class REvent extends SM2Verifiable implements Serializable {
         this.semantics = semantics;
     }
 
+    public boolean isForward() {
+        return forward;
+    }
+
+    public void setForward(boolean forward) {
+        this.forward = forward;
+    }
+
+    public String getCenter() {
+        return center;
+    }
+
+    public void setCenter(String center) {
+        this.center = center;
+    }
+
     public void doSignature(String pubKey, String privKey) {
         this.setPublicKey(pubKey);
         this.doSignature(privKey);
@@ -91,13 +101,12 @@ public class REvent extends SM2Verifiable implements Serializable {
     @Override
     public String getContentStr() {
         return String.format("{\"topic\":\"%s\",\"content\":\"%s\",\"type\":\"%s\"," +
-                        "\"semantics\":\"%s\",\"requestID\":\"%s\",\"txHash\":\"%s\"}",
+                        "\"semantics\":\"%s\",\"requestID\":\"%s\"}",
                 topic,
                 content,
                 type,
                 semantics,
-                requestID,
+                requestID);
-                (null == txHash ? "" : txHash));
     }
 
     public enum REventType {

src/main/base/org/bdware/sc/node/AnnotationHook.java

@@ -1,8 +1,7 @@
 package org.bdware.sc.node;
 
 import org.bdware.sc.JSEngine;
-import org.bdware.sc.bean.ContractRequest;
 
 public interface AnnotationHook {
-    Object handle(ContractRequest input, JSEngine desktopEngine, Object ret);
+    ArgPacks handle(JSEngine desktopEngine, ArgPacks argPacks);
 }

src/main/base/org/bdware/sc/node/ArgPacks.java

@@ -0,0 +1,15 @@
+package org.bdware.sc.node;
+
+import org.bdware.sc.bean.ContractRequest;
+
+public class ArgPacks {
+    public Object ret;
+    public ContractRequest request;
+    public Object arg;
+
+    public ArgPacks(ContractRequest request, Object arg, Object ret) {
+        this.request = request;
+        this.arg = arg;
+        this.ret = ret;
+    }
+}

src/main/base/org/bdware/sc/node/ContractManifest.java

@@ -1,5 +1,6 @@
 package org.bdware.sc.node;
 
+import com.google.gson.JsonElement;
 import org.bdware.sc.bean.ContractExecType;
 import org.bdware.sc.py.bean.PYPackage;
 
@@ -18,6 +19,7 @@ public class ContractManifest {
     private List<Permission> permissions;
     public boolean startAtUnpack;
     public String sourcePath;
+    public JsonElement createParam;
 
     public List<PYPackage> getPyDependences() {
         return pyDependences;

src/main/base/org/bdware/sc/node/ContractNode.java

@@ -1,6 +1,7 @@
 package org.bdware.sc.node;
 
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.bdware.doip.codec.operations.BasicOperations;
 import org.bdware.sc.event.REvent.REventSemantics;
 
 import java.util.*;
@@ -45,6 +46,14 @@ public class ContractNode {
         getFunctions().add(function);
     }
 
+    public void updateFunctionMap(String oldFunctionName, String newFunctionName) {
+        FunctionNode fn = functionMap.getOrDefault(oldFunctionName, null);
+        if(fn != null) {
+            functionMap.remove(oldFunctionName);
+            functionMap.put(newFunctionName, fn);
+        }
+    }
+
     public void addClass(ClassNode clzNode) {
         getClzs().add(clzNode);
     }
@@ -192,4 +201,8 @@ public class ContractNode {
     public void setInstrumentBranch(boolean b) {
         instrumentBranch = b;
     }
+
+    public void resetContractName(String name) {
+        contractName = name;
+    }
 }

src/main/base/org/bdware/sc/node/FunctionNode.java

@@ -1,6 +1,7 @@
 package org.bdware.sc.node;
 
 import com.google.gson.JsonElement;
+import org.bdware.sc.bean.DoipOperationInfo;
 import org.bdware.sc.bean.JoinInfo;
 import org.bdware.sc.bean.RouteInfo;
 
@@ -25,15 +26,18 @@ public class FunctionNode extends Script {
     private CostDetail cost;
     private RouteInfo routeInfo;
     private JoinInfo joinInfo;
+    private DoipOperationInfo doipOperationInfo;
     private boolean isHandler;
     private boolean isConfidential;
     private boolean isHomomorphicEncrypt;
     private boolean isHomomorphicDecrypt;
     private boolean isView;
+    private boolean isDoipOperation;
     private String keyManagerID;
     private String secretID;
     private JsonElement homoEncryptConf;
     private JsonElement homoDecryptConf;
+    public transient Class compiledClazz;
 
     public FunctionNode(String name, String fileName) {
         this.functionName = name;
@@ -57,6 +61,24 @@ public class FunctionNode extends Script {
         afterInvoke = new ArrayList<>();
     }
 
+    public DoipOperationInfo getDoipOperationInfo() {
+        return doipOperationInfo;
+    }
+
+    public void setDoipOperationInfo(DoipOperationInfo doipOperationInfo) {
+        this.doipOperationInfo = doipOperationInfo;
+    }
+
+    public void setIsDoipOperation(boolean doipOperation) {
+        isDoipOperation = doipOperation;
+    }
+
+
+    public boolean isDoipOperation() {
+        return isDoipOperation;
+    }
+
+
     public Set<String> getDependentFunctions() {
         return dependentFunctions;
     }
@@ -103,7 +125,7 @@ public class FunctionNode extends Script {
 
     public void addArg(String arg) {
         args.add(arg);
-        if (arg.equals("requester")) {
+        if (isExport && arg.equals("requester")) {
             throw new IllegalArgumentException("The argument shouldn't be requester");
         }
     }
@@ -265,4 +287,12 @@ public class FunctionNode extends Script {
     public void setHomoDecryptConf(JsonElement homoDecryptConf) {
         this.homoDecryptConf = homoDecryptConf;
     }
+
+    public String getFunctionName() {
+        return functionName;
+    }
+
+    public void setFunctionName(String functionName) {
+        this.functionName = functionName;
+    }
 }

src/main/base/org/bdware/sc/node/Permission.java

@@ -10,12 +10,15 @@ public enum Permission {
     RocksDB,
     MongoDB,
     BDWareTimeSeriesDB,
+    MultiTagIndexDB,
     SM2,
     AES,
     Ledger,
     CM,
     DOIP,
-    Async;
+    IRP,
+    Async,
+    Cluster;
 
     public static Permission parse(String str) {
         try {

src/main/base/org/bdware/sc/node/YjsType.java

@@ -3,5 +3,6 @@ package org.bdware.sc.node;
 public enum YjsType {
     Oracle,
     Contract,
+    DoipModule,
     Module
 }

src/main/base/org/bdware/sc/visitor/ContractReader.java

@@ -72,7 +72,10 @@ public class ContractReader extends YJSParserBaseVisitor<ContractNode> {
             node.setYjsType(YjsType.Contract);
         } else if (null != contractDelcar.Module()) {
             node.setYjsType(YjsType.Module);
+        } else if (null != contractDelcar.DoipModule()) {
+            node.setYjsType(YjsType.DoipModule);
         }
+
         if (null != contractDelcar.annotations())
             annotations = contractDelcar.annotations().annotation();
         for (AnnotationContext annotation : annotations) {

src/main/entry/org/bdware/sc/DoipServiceInfoConfigurer.java.txt

@@ -0,0 +1,14 @@
+package org.bdware.sc;
+
+import org.bdware.doip.application.DoipServiceConfig;
+import org.bdware.doip.endpoint.doipServer.DoipServiceInfo;
+
+public interface DoipServiceInfoConfigurer {
+    String getServiceHandle();
+
+    String resetServiceConfig(String configJson);
+
+    DoipServiceConfig getDoipServiceConfig();
+
+    DoipServiceInfo getDoipServiceInfo();
+}

src/main/entry/org/bdware/sc/YJSPacker.java

@@ -275,12 +275,21 @@ public class YJSPacker {
                 if (!parent.exists()) {
                     LOGGER.trace("create directory " + parent.getAbsolutePath() + ": " + parent.mkdirs());
                 }
-                FileOutputStream fout = new FileOutputStream(target);
+                if (!target.exists()) {
-                for (int k; (k = zin.read(buff)) > 0; ) {
+                    if (entry.isDirectory()) {
-                    fout.write(buff, 0, k);
+                        target.mkdirs();
+                    } else {
+                        target.createNewFile();
+                    }
+                }
+                if (!entry.isDirectory()) {
+                    FileOutputStream fout = new FileOutputStream(target);
+                    for (int k; (k = zin.read(buff)) > 0; ) {
+                        fout.write(buff, 0, k);
+                    }
+                    fout.close();
+                    zin.closeEntry();
                 }
-                fout.close();
-                zin.closeEntry();
             }
             zin.close();
         } catch (Exception e) {

src/main/entry/org/bdware/sc/bean/Contract.java

@@ -40,6 +40,9 @@ public class Contract extends SM2Verifiable implements Serializable {
     private boolean stateful = true; // manifest可配置
     private YjsType yjsType;
 
+    private SerializableJson createParam;
+    private int remoteDebugPort = 0;
+
     public int getShardingId() {
         return this.shardingId;
     }
@@ -226,4 +229,21 @@ public class Contract extends SM2Verifiable implements Serializable {
         this.buildTime = buildTime;
     }
 
+    public void setCreateParam(JsonElement ele) {
+        createParam = new SerializableJson(ele);
+    }
+
+    public void setRemoteDebugPort(int port) {
+        remoteDebugPort = port;
+    }
+
+    public JsonElement getCreateParam() {
+        if (createParam != null)
+            return createParam.getJsonElement();
+        return null;
+    }
+
+    public int getRemoteDebugPort() {
+        return remoteDebugPort;
+    }
 }

src/main/entry/org/bdware/sc/bean/ContractExecType.java

@@ -11,7 +11,8 @@ public enum ContractExecType implements Serializable {
     RequestAllResponseAll,
     Sharding,//分片执行模式
     SelfAdaptiveSharding,// self-adaptive sharding
-    PBFT; //PBFT
+    PBFT, //PBFT
+    RAFT;
 
 
     public static ContractExecType getContractTypeByInt(int i) {

src/main/entry/org/bdware/sc/bean/ContractRequest.java

@@ -23,7 +23,6 @@ public class ContractRequest extends SM2Verifiable
     String requesterDOI;
     // action = rsaPrivKeyEncoded(aesKey);
     String action;
-    // arg = aesKeyEncoded({action,arg});
     JsonElement arg;
     String requestID;
     boolean fromDebug = false;

src/main/entry/org/bdware/sc/bean/DefaultRouteRule.java

@@ -1,7 +1,5 @@
 package org.bdware.sc.bean;
 
 public enum DefaultRouteRule {
-    byRequester,
+    byRequester, byArgHash, byJsonPropHash, byShardingIDTree, byFunc;
-    byArgHash,
-    byTarget;
 }

src/main/entry/org/bdware/sc/bean/DoipOperationInfo.java

@@ -0,0 +1,38 @@
+package org.bdware.sc.bean;
+
+import org.bdware.doip.codec.operations.BasicOperations;
+import org.bdware.sc.node.AnnotationNode;
+import org.bdware.sc.node.ContractNode;
+import org.bdware.sc.util.JsonUtil;
+
+public class DoipOperationInfo {
+    public String operationType;
+    public String operationName;
+    public BasicOperations operation;
+
+    // todo 对于extension进行特别处理，getArg() == 2就行？这里合理吗？参考RouteInfo貌似合理？
+    public static DoipOperationInfo create(AnnotationNode annotationNode, ContractNode contractNode) {
+        DoipOperationInfo info = new DoipOperationInfo();
+        if (annotationNode.getArgs().size() == 1) {
+            String str = annotationNode.getArgs().get(0);
+            info = JsonUtil.fromJson(str, DoipOperationInfo.class);
+
+            // according to operationType to find operation and fill the corresponding fields
+            String opStr = info.operationType;
+            for (BasicOperations op : BasicOperations.values()) {
+                if (op.toString().equals(opStr)) {
+                   info.operation = op;
+                }
+            }
+
+            if(info.operation == null) info.operation = BasicOperations.Unknown;
+
+            // If operation is not Extension, set the operationName directly from operation
+            if(info.operation != BasicOperations.Extension) {
+                info.operationName = info.operation.getName();
+            }
+        }
+        System.out.println("[DoipOperationInfo] annotationNode:" + JsonUtil.toJson(annotationNode));
+        return info;
+    }
+}

src/main/entry/org/bdware/sc/bean/JoinInfo.java

@@ -1,6 +1,5 @@
 package org.bdware.sc.bean;
 
-import com.google.gson.JsonElement;
 import org.bdware.sc.node.AnnotationNode;
 import org.bdware.sc.node.ContractNode;
 import org.bdware.sc.util.JsonUtil;
@@ -8,12 +7,14 @@ import org.bdware.sc.util.JsonUtil;
 import java.io.Serializable;
 
 public class JoinInfo implements Serializable {
-    public String joinRule;
+    public DefaultJoinRule useDefault;
-    public JsonElement joinCount;
+    public String joinFuncName;
+    public int joinCount;
+    public String joinCountFuncName;
 
     public static JoinInfo create(AnnotationNode annotationNode, ContractNode contractNode) {
         JoinInfo info = new JoinInfo();
-        info.joinRule = null;
+        info.useDefault = null;
         if (annotationNode.getArgs().size() == 1) {
             String str = annotationNode.getArgs().get(0);
             info = JsonUtil.fromJson(str, JoinInfo.class);

src/main/entry/org/bdware/sc/bean/RouteInfo.java

@@ -8,6 +8,10 @@ import java.io.Serializable;
 
 public class RouteInfo implements Serializable {
     public DefaultRouteRule useDefault;
+    // The signature of RouteFunction is
+    // function myFunc(requester, sourceArg)
+    public String funcName;
+    public String param;
 
     public static RouteInfo create(AnnotationNode annotationNode, ContractNode contractNode) {
         RouteInfo info = new RouteInfo();

src/main/entry/org/bdware/sc/bean/SerializableJson.java

@@ -0,0 +1,25 @@
+package org.bdware.sc.bean;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class SerializableJson implements Serializable {
+    transient JsonElement jsonElement;
+    String content;
+
+    public SerializableJson(JsonElement jsonElement) {
+        this.jsonElement = jsonElement;
+        if (jsonElement != null)
+            content = jsonElement.toString();
+    }
+
+    public JsonElement getJsonElement() {
+        if (jsonElement != null)
+            return jsonElement;
+        if (content != null)
+            return JsonParser.parseString(content);
+        return null;
+    }
+}

src/main/entry/org/bdware/sc/db/MultiIndexTimeRocksDBUtil.java

@@ -18,6 +18,7 @@ import java.util.*;
 public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
     private static final Logger LOGGER = LogManager.getLogger(MultiIndexTimeRocksDBUtil.class);
     private final Map<String, TimeSerialIndex> secondaryIndex;
+    static String primaryKey = "_DB_primary_";
     public String dbPath;
     public String tableName;
     Random random = new Random();
@@ -42,7 +43,7 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
         Options options = new Options();
         options.setCreateIfMissing(true);
         File lockFile = new File(file, "LOCK");
-        File timeIndex = new File(dbPath + "/" + tableName + "/DB.primary.timeindex");
+        File timeIndex = new File(dbPath + "/" + tableName + "/" + primaryIndex + ".timeindex");
         LOGGER.trace("create directory " + file.getAbsolutePath() + ": " + file.mkdirs());
         LOGGER.trace("delete file" + lockFile.getAbsolutePath() + ": " + lockFile.delete());
         try {
@@ -51,8 +52,16 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
         } catch (RocksDBException e) {
             e.printStackTrace();
         }
-
         primaryIndex = new TimeSerialIndex(timeIndex.getAbsolutePath());
+        secondaryIndex.put(primaryKey, primaryIndex);
+        for (File f : timeIndex.getParentFile().listFiles()) {
+            if (!f.getName().endsWith(".timeindex")) continue;
+            if (f.getName().equals(timeIndex.getName())) continue;
+            TimeSerialIndex index =
+                    new TimeSerialIndex(f.getAbsolutePath());
+            secondaryIndex.putIfAbsent(f.getName().substring(0,
+                    f.getName().length() - ".timeindex".length()), index);
+        }
     }
 
     public synchronized void put(String label, String val) {
@@ -141,8 +150,13 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
 
     public long size(String label) {
         try {
-            TimeSerialIndex index = getIndex(label);
+            if (label == null || label.length() == 0) {
-            if (index != null) return index.size();
+                return primaryIndex.size();
+            }
+            if (secondaryIndex.containsKey(label)) {
+                TimeSerialIndex index = getIndex(label);
+                return index.size();
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -152,17 +166,23 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
     public List<JsonObject> queryByOffset(String label, long offset, int count) {
         List<JsonObject> ret = new ArrayList<>();
         TimeSerialIndex index = getIndex(label);
-        List<Long> data = index.request(offset, count);
+        List<TimeSerialIndex.IndexEntry> data = index.requestIndexEntry(offset, count);
-        for (Long l : data) {
+        for (TimeSerialIndex.IndexEntry entry : data) {
             try {
-                String t = new String(db.get(longToByte(l)));
+                String t = new String(db.get(longToByte(entry.value)));
                 JsonObject jo;
                 if (!t.isEmpty()) {
-                    jo = JsonUtil.parseStringAsJsonObject(t);
+                    try {
+                        jo = JsonUtil.parseStringAsJsonObject(t);
+                    } catch (Exception e) {
+                        jo = new JsonObject();
+                        jo.addProperty("data", t);
+                    }
                 } else {
                     jo = new JsonObject();
                 }
-                jo.addProperty("key", l.toString());
+                jo.addProperty("key", entry.value);
+                jo.addProperty("timestamp", entry.key);
                 ret.add(jo);
             } catch (Exception e) {
                 e.printStackTrace();
@@ -181,7 +201,7 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
     }
 
     private TimeSerialIndex getIndex(String label) {
-        if (null == label) {
+        if (null == label || label.length() == 0) {
             return primaryIndex;
         }
         if (secondaryIndex.containsKey(label)) {
@@ -275,6 +295,31 @@ public class MultiIndexTimeRocksDBUtil implements MultiIndexTimeDBUtilIntf {
         // manuellyIndex可参考LenVarTimeIndex写法
     }
 
+    public void close() {
+        db.close();
+    }
+
+    public List<String> getIndexStartWith(String prefix) {
+        List<String> ret = new ArrayList<>();
+        if (prefix == null) {
+            prefix = "";
+        }
+        for (String key : secondaryIndex.keySet()) {
+            if (key.startsWith(prefix))
+                ret.add(key);
+        }
+        ret.remove(primaryKey);
+        return ret;
+    }
+
+    public List<String> getAllIndexKey() {
+        Set<String> data = secondaryIndex.keySet();
+        List<String> ret = new ArrayList<>();
+        ret.addAll(data);
+        ret.remove(primaryKey);
+        return ret;
+    }
+
     // TODO
     static class BytesPair {
         byte[] key, value;

src/main/entry/org/bdware/sc/index/TimeSerialIndex.java

@@ -85,6 +85,39 @@ public class TimeSerialIndex {
         } else return new ArrayList<>();
     }
 
+    public static class IndexEntry {
+        public long key, value;
+    }
+
+    public synchronized List<IndexEntry> requestIndexEntry(long offset, int len) {
+        List<IndexEntry> ret = new ArrayList<>();
+        if (offset < 0) offset = 0;
+        if (offset < fileSize) {
+            long pos = 0;
+            try {
+                pos = file.getFilePointer();
+                file.seek(2L * offset * 8L);
+                for (; offset < fileSize && len > 0; len--) {
+                    IndexEntry entry = new IndexEntry();
+                    entry.key = file.readLong();
+                    entry.value = file.readLong();
+                    ret.add(entry);
+                    offset++;
+                }
+                file.seek(pos);
+            } catch (IOException e) {
+                e.printStackTrace();
+            } finally {
+                try {
+                    file.seek(pos);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            return ret;
+        } else return new ArrayList<>();
+    }
+
     private long getIndex(long offset) {
         if (offset < fileSize) {
             try {
@@ -109,7 +142,7 @@ public class TimeSerialIndex {
     public synchronized long findNearest(long timeStamp) {
         try {
             long pos = file.getFilePointer();
-            long ret = binarySearch(0L, fileSize + 1, timeStamp);
+            long ret = binarySearch(0L, fileSize, timeStamp);
             file.seek(pos);
             return ret;
         } catch (IOException e) {
@@ -120,9 +153,14 @@ public class TimeSerialIndex {
     }
 
     private long binarySearch(long start, long end, long timeStamp) {
-        if (start >= end - 1) return start;
+        if (end <= 0) return end;
+        if (start >= end - 1) {
+            long key = getIndex(end - 1);
+            if (key >= timeStamp) {
+                return end - 1;
+            } else return end;
+        }
         long mid = (start + end) / 2;
-        if (mid >= end - 1) return mid;
         long key = getIndex(mid);
         if (key >= timeStamp) {
             return binarySearch(start, mid, timeStamp);

src/main/gen/org/bdware/sc/parser/JavaScriptLexer.java

@@ -1,4 +1,5 @@
-package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/bdcontract-bundle/genparser/input/JavaScriptLexer.g4 by ANTLR 4.9.2
+// Generated from JavaScriptLexer.g4 by ANTLR 4.9.2
+package org.bdware.sc.parser;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Token;
@@ -34,10 +35,11 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 		Default=81, If=82, Throw=83, Delete=84, In=85, Try=86, Event=87, AtToken=88, 
 		AtLeastOnce=89, AtMostOnce=90, OnlyOnce=91, Global=92, Local=93, View=94, 
 		Class=95, Enum=96, Extends=97, Super=98, Const=99, Export=100, Import=101, 
-		Contract=102, Module=103, Oracle=104, Implements=105, Let=106, Private=107, 
+		Contract=102, Module=103, Oracle=104, DoipModule=105, Implements=106, 
-		Public=108, Interface=109, Package=110, Protected=111, Static=112, Yield=113, 
+		Let=107, Private=108, Public=109, Interface=110, Package=111, Protected=112, 
-		Identifier=114, StringLiteral=115, TemplateStringLiteral=116, WhiteSpaces=117, 
+		Static=113, Yield=114, Identifier=115, StringLiteral=116, TemplateStringLiteral=117, 
-		LineTerminator=118, HtmlComment=119, CDataComment=120, UnexpectedCharacter=121;
+		WhiteSpaces=118, LineTerminator=119, HtmlComment=120, CDataComment=121, 
+		UnexpectedCharacter=122;
 	public static final int
 		ERROR=2;
 	public static String[] channelNames = {
@@ -67,9 +69,9 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 			"Debugger", "Function", "This", "With", "Default", "If", "Throw", "Delete", 
 			"In", "Try", "Event", "AtToken", "AtLeastOnce", "AtMostOnce", "OnlyOnce", 
 			"Global", "Local", "View", "Class", "Enum", "Extends", "Super", "Const", 
-			"Export", "Import", "Contract", "Module", "Oracle", "Implements", "Let", 
+			"Export", "Import", "Contract", "Module", "Oracle", "DoipModule", "Implements", 
-			"Private", "Public", "Interface", "Package", "Protected", "Static", "Yield", 
+			"Let", "Private", "Public", "Interface", "Package", "Protected", "Static", 
-			"Identifier", "StringLiteral", "TemplateStringLiteral", "WhiteSpaces", 
+			"Yield", "Identifier", "StringLiteral", "TemplateStringLiteral", "WhiteSpaces", 
 			"LineTerminator", "HtmlComment", "CDataComment", "UnexpectedCharacter", 
 			"DoubleStringCharacter", "SingleStringCharacter", "EscapeSequence", "CharacterEscapeSequence", 
 			"HexEscapeSequence", "UnicodeEscapeSequence", "ExtendedUnicodeEscapeSequence", 
@@ -97,8 +99,8 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 			"'try'", "'event'", "'@'", "'AT_LEAST_ONCE'", "'AT_MOST_ONCE'", "'ONLY_ONCE'", 
 			"'global'", "'local'", "'view'", "'class'", "'enum'", "'extends'", "'super'", 
 			"'const'", "'export'", "'import'", "'contract'", "'module'", "'oracle'", 
-			"'implements'", "'let'", "'private'", "'public'", "'interface'", "'package'", 
+			"'doipmodule'", "'implements'", "'let'", "'private'", "'public'", "'interface'", 
-			"'protected'", "'static'", "'yield'"
+			"'package'", "'protected'", "'static'", "'yield'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
@@ -121,9 +123,9 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 			"Debugger", "Function", "This", "With", "Default", "If", "Throw", "Delete", 
 			"In", "Try", "Event", "AtToken", "AtLeastOnce", "AtMostOnce", "OnlyOnce", 
 			"Global", "Local", "View", "Class", "Enum", "Extends", "Super", "Const", 
-			"Export", "Import", "Contract", "Module", "Oracle", "Implements", "Let", 
+			"Export", "Import", "Contract", "Module", "Oracle", "DoipModule", "Implements", 
-			"Private", "Public", "Interface", "Package", "Protected", "Static", "Yield", 
+			"Let", "Private", "Public", "Interface", "Package", "Protected", "Static", 
-			"Identifier", "StringLiteral", "TemplateStringLiteral", "WhiteSpaces", 
+			"Yield", "Identifier", "StringLiteral", "TemplateStringLiteral", "WhiteSpaces", 
 			"LineTerminator", "HtmlComment", "CDataComment", "UnexpectedCharacter"
 		};
 	}
@@ -194,7 +196,7 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 		case 8:
 			CloseBrace_action((RuleContext)_localctx, actionIndex);
 			break;
-		case 114:
+		case 115:
 			StringLiteral_action((RuleContext)_localctx, actionIndex);
 			break;
 		}
@@ -227,23 +229,23 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 			return RegularExpressionLiteral_sempred((RuleContext)_localctx, predIndex);
 		case 57:
 			return OctalIntegerLiteral_sempred((RuleContext)_localctx, predIndex);
-		case 104:
-			return Implements_sempred((RuleContext)_localctx, predIndex);
 		case 105:
-			return Let_sempred((RuleContext)_localctx, predIndex);
+			return Implements_sempred((RuleContext)_localctx, predIndex);
 		case 106:
-			return Private_sempred((RuleContext)_localctx, predIndex);
+			return Let_sempred((RuleContext)_localctx, predIndex);
 		case 107:
-			return Public_sempred((RuleContext)_localctx, predIndex);
+			return Private_sempred((RuleContext)_localctx, predIndex);
 		case 108:
-			return Interface_sempred((RuleContext)_localctx, predIndex);
+			return Public_sempred((RuleContext)_localctx, predIndex);
 		case 109:
-			return Package_sempred((RuleContext)_localctx, predIndex);
+			return Interface_sempred((RuleContext)_localctx, predIndex);
 		case 110:
-			return Protected_sempred((RuleContext)_localctx, predIndex);
+			return Package_sempred((RuleContext)_localctx, predIndex);
 		case 111:
-			return Static_sempred((RuleContext)_localctx, predIndex);
+			return Protected_sempred((RuleContext)_localctx, predIndex);
 		case 112:
+			return Static_sempred((RuleContext)_localctx, predIndex);
+		case 113:
 			return Yield_sempred((RuleContext)_localctx, predIndex);
 		}
 		return true;
@@ -327,7 +329,7 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 	}
 
 	public static final String _serializedATN =
-		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2{\u0463\b\1\4\2\t"+
+		"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2|\u0470\b\1\4\2\t"+
 		"\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
 		"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
 		"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
@@ -344,449 +346,453 @@ public class JavaScriptLexer extends JavaScriptBaseLexer {
 		"\4\u0081\t\u0081\4\u0082\t\u0082\4\u0083\t\u0083\4\u0084\t\u0084\4\u0085"+
 		"\t\u0085\4\u0086\t\u0086\4\u0087\t\u0087\4\u0088\t\u0088\4\u0089\t\u0089"+
 		"\4\u008a\t\u008a\4\u008b\t\u008b\4\u008c\t\u008c\4\u008d\t\u008d\4\u008e"+
-		"\t\u008e\4\u008f\t\u008f\4\u0090\t\u0090\4\u0091\t\u0091\3\2\3\2\3\2\3"+
+		"\t\u008e\4\u008f\t\u008f\4\u0090\t\u0090\4\u0091\t\u0091\4\u0092\t\u0092"+
-		"\2\7\2\u0128\n\2\f\2\16\2\u012b\13\2\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3"+
+		"\3\2\3\2\3\2\3\2\7\2\u012a\n\2\f\2\16\2\u012d\13\2\3\2\3\2\3\2\3\2\3\2"+
-		"\3\7\3\u0136\n\3\f\3\16\3\u0139\13\3\3\3\3\3\3\4\3\4\6\4\u013f\n\4\r\4"+
+		"\3\3\3\3\3\3\3\3\7\3\u0138\n\3\f\3\16\3\u013b\13\3\3\3\3\3\3\4\3\4\6\4"+
-		"\16\4\u0140\3\4\3\4\3\4\7\4\u0146\n\4\f\4\16\4\u0149\13\4\3\5\3\5\3\6"+
+		"\u0141\n\4\r\4\16\4\u0142\3\4\3\4\3\4\7\4\u0148\n\4\f\4\16\4\u014b\13"+
-		"\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\t\3\n\3\n\3\n\3\13\3\13\3\f\3\f\3\r\3\r"+
+		"\4\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\t\3\n\3\n\3\n\3\13\3\13\3"+
-		"\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\21\3\21\3\22\3\22\3\22\3\23"+
+		"\f\3\f\3\r\3\r\3\16\3\16\3\17\3\17\3\20\3\20\3\20\3\20\3\21\3\21\3\22"+
-		"\3\23\3\23\3\24\3\24\3\25\3\25\3\26\3\26\3\27\3\27\3\30\3\30\3\31\3\31"+
+		"\3\22\3\22\3\23\3\23\3\23\3\24\3\24\3\25\3\25\3\26\3\26\3\27\3\27\3\30"+
-		"\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\36\3\36"+
+		"\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\33\3\34\3\34\3\34\3\35\3\35\3\35"+
-		"\3\37\3\37\3 \3 \3 \3!\3!\3!\3\"\3\"\3\"\3#\3#\3#\3$\3$\3$\3$\3%\3%\3"+
+		"\3\35\3\36\3\36\3\37\3\37\3 \3 \3 \3!\3!\3!\3\"\3\"\3\"\3#\3#\3#\3$\3"+
-		"%\3%\3&\3&\3\'\3\'\3(\3(\3)\3)\3)\3*\3*\3*\3+\3+\3+\3,\3,\3,\3-\3-\3-"+
+		"$\3$\3$\3%\3%\3%\3%\3&\3&\3\'\3\'\3(\3(\3)\3)\3)\3*\3*\3*\3+\3+\3+\3,"+
-		"\3.\3.\3.\3/\3/\3/\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\62\3\62\3"+
+		"\3,\3,\3-\3-\3-\3.\3.\3.\3/\3/\3/\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3"+
-		"\62\3\62\3\62\3\63\3\63\3\63\3\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3"+
+		"\61\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\64\3\64\3\64\3\65\3\65\3"+
-		"\66\3\67\3\67\3\67\3\67\3\67\38\38\38\38\38\38\38\38\38\58\u01e1\n8\3"+
+		"\65\3\66\3\66\3\66\3\67\3\67\3\67\3\67\3\67\38\38\38\38\38\38\38\38\3"+
-		"9\39\39\79\u01e6\n9\f9\169\u01e9\139\39\59\u01ec\n9\39\39\69\u01f0\n9"+
+		"8\58\u01e3\n8\39\39\39\79\u01e8\n9\f9\169\u01eb\139\39\59\u01ee\n9\39"+
-		"\r9\169\u01f1\39\59\u01f5\n9\39\39\59\u01f9\n9\59\u01fb\n9\3:\3:\3:\6"+
+		"\39\69\u01f2\n9\r9\169\u01f3\39\59\u01f7\n9\39\39\59\u01fb\n9\59\u01fd"+
-		":\u0200\n:\r:\16:\u0201\3;\3;\6;\u0206\n;\r;\16;\u0207\3;\3;\3<\3<\3<"+
+		"\n9\3:\3:\3:\6:\u0202\n:\r:\16:\u0203\3;\3;\6;\u0208\n;\r;\16;\u0209\3"+
-		"\6<\u020f\n<\r<\16<\u0210\3=\3=\3=\6=\u0216\n=\r=\16=\u0217\3>\3>\3>\3"+
+		";\3;\3<\3<\3<\6<\u0211\n<\r<\16<\u0212\3=\3=\3=\6=\u0218\n=\r=\16=\u0219"+
-		">\3>\3>\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A\3A\3A\3A\3"+
+		"\3>\3>\3>\3>\3>\3>\3?\3?\3?\3@\3@\3@\3@\3@\3@\3@\3@\3@\3@\3@\3A\3A\3A"+
-		"A\3B\3B\3B\3B\3B\3C\3C\3C\3C\3C\3D\3D\3D\3D\3E\3E\3E\3E\3F\3F\3F\3F\3"+
+		"\3A\3A\3A\3A\3B\3B\3B\3B\3B\3C\3C\3C\3C\3C\3D\3D\3D\3D\3E\3E\3E\3E\3F"+
-		"F\3F\3G\3G\3G\3G\3G\3G\3G\3G\3H\3H\3H\3H\3H\3H\3H\3I\3I\3I\3I\3I\3J\3"+
+		"\3F\3F\3F\3F\3F\3G\3G\3G\3G\3G\3G\3G\3G\3H\3H\3H\3H\3H\3H\3H\3I\3I\3I"+
-		"J\3J\3J\3J\3J\3J\3J\3J\3K\3K\3K\3K\3L\3L\3L\3L\3L\3L\3L\3M\3M\3M\3M\3"+
+		"\3I\3I\3J\3J\3J\3J\3J\3J\3J\3J\3J\3K\3K\3K\3K\3L\3L\3L\3L\3L\3L\3L\3M"+
-		"M\3M\3N\3N\3N\3N\3N\3N\3N\3N\3N\3O\3O\3O\3O\3O\3O\3O\3O\3O\3P\3P\3P\3"+
+		"\3M\3M\3M\3M\3M\3N\3N\3N\3N\3N\3N\3N\3N\3N\3O\3O\3O\3O\3O\3O\3O\3O\3O"+
-		"P\3P\3Q\3Q\3Q\3Q\3Q\3R\3R\3R\3R\3R\3R\3R\3R\3S\3S\3S\3T\3T\3T\3T\3T\3"+
+		"\3P\3P\3P\3P\3P\3Q\3Q\3Q\3Q\3Q\3R\3R\3R\3R\3R\3R\3R\3R\3S\3S\3S\3T\3T"+
-		"T\3U\3U\3U\3U\3U\3U\3U\3V\3V\3V\3W\3W\3W\3W\3X\3X\3X\3X\3X\3X\3Y\3Y\3"+
+		"\3T\3T\3T\3T\3U\3U\3U\3U\3U\3U\3U\3V\3V\3V\3W\3W\3W\3W\3X\3X\3X\3X\3X"+
-		"Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3[\3[\3[\3[\3[\3[\3[\3[\3[\3"+
+		"\3X\3Y\3Y\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3Z\3[\3[\3[\3[\3[\3["+
-		"[\3[\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3]\3]\3]\3]\3]\3]\3"+
+		"\3[\3[\3[\3[\3[\3[\3[\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3\\\3]\3]\3"+
-		"]\3^\3^\3^\3^\3^\3^\3_\3_\3_\3_\3_\3`\3`\3`\3`\3`\3`\3a\3a\3a\3a\3a\3"+
+		"]\3]\3]\3]\3]\3^\3^\3^\3^\3^\3^\3_\3_\3_\3_\3_\3`\3`\3`\3`\3`\3`\3a\3"+
-		"b\3b\3b\3b\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d\3d\3d\3d\3d\3d\3e\3e\3e\3"+
+		"a\3a\3a\3a\3b\3b\3b\3b\3b\3b\3b\3b\3c\3c\3c\3c\3c\3c\3d\3d\3d\3d\3d\3"+
-		"e\3e\3e\3e\3f\3f\3f\3f\3f\3f\3f\3g\3g\3g\3g\3g\3g\3g\3g\3g\3h\3h\3h\3"+
+		"d\3e\3e\3e\3e\3e\3e\3e\3f\3f\3f\3f\3f\3f\3f\3g\3g\3g\3g\3g\3g\3g\3g\3"+
-		"h\3h\3h\3h\3i\3i\3i\3i\3i\3i\3i\3j\3j\3j\3j\3j\3j\3j\3j\3j\3j\3j\3j\3"+
+		"g\3h\3h\3h\3h\3h\3h\3h\3i\3i\3i\3i\3i\3i\3i\3j\3j\3j\3j\3j\3j\3j\3j\3"+
-		"j\3k\3k\3k\3k\3k\3k\3l\3l\3l\3l\3l\3l\3l\3l\3l\3l\3m\3m\3m\3m\3m\3m\3"+
+		"j\3j\3j\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3k\3l\3l\3l\3l\3l\3l\3m\3"+
-		"m\3m\3m\3n\3n\3n\3n\3n\3n\3n\3n\3n\3n\3n\3n\3o\3o\3o\3o\3o\3o\3o\3o\3"+
+		"m\3m\3m\3m\3m\3m\3m\3m\3m\3n\3n\3n\3n\3n\3n\3n\3n\3n\3o\3o\3o\3o\3o\3"+
-		"o\3o\3p\3p\3p\3p\3p\3p\3p\3p\3p\3p\3p\3p\3q\3q\3q\3q\3q\3q\3q\3q\3q\3"+
+		"o\3o\3o\3o\3o\3o\3o\3p\3p\3p\3p\3p\3p\3p\3p\3p\3p\3q\3q\3q\3q\3q\3q\3"+
-		"r\3r\3r\3r\3r\3r\3r\3r\3s\3s\7s\u0394\ns\fs\16s\u0397\13s\3t\3t\7t\u039b"+
+		"q\3q\3q\3q\3q\3q\3r\3r\3r\3r\3r\3r\3r\3r\3r\3s\3s\3s\3s\3s\3s\3s\3s\3"+
-		"\nt\ft\16t\u039e\13t\3t\3t\3t\7t\u03a3\nt\ft\16t\u03a6\13t\3t\5t\u03a9"+
+		"t\3t\7t\u03a1\nt\ft\16t\u03a4\13t\3u\3u\7u\u03a8\nu\fu\16u\u03ab\13u\3"+
-		"\nt\3t\3t\3u\3u\3u\3u\7u\u03b1\nu\fu\16u\u03b4\13u\3u\3u\3v\6v\u03b9\n"+
+		"u\3u\3u\7u\u03b0\nu\fu\16u\u03b3\13u\3u\5u\u03b6\nu\3u\3u\3v\3v\3v\3v"+
-		"v\rv\16v\u03ba\3v\3v\3w\3w\3w\3w\3x\3x\3x\3x\3x\3x\7x\u03c9\nx\fx\16x"+
+		"\7v\u03be\nv\fv\16v\u03c1\13v\3v\3v\3w\6w\u03c6\nw\rw\16w\u03c7\3w\3w"+
-		"\u03cc\13x\3x\3x\3x\3x\3x\3x\3y\3y\3y\3y\3y\3y\3y\3y\3y\3y\3y\7y\u03df"+
+		"\3x\3x\3x\3x\3y\3y\3y\3y\3y\3y\7y\u03d6\ny\fy\16y\u03d9\13y\3y\3y\3y\3"+
-		"\ny\fy\16y\u03e2\13y\3y\3y\3y\3y\3y\3y\3z\3z\3z\3z\3{\3{\3{\3{\5{\u03f2"+
+		"y\3y\3y\3z\3z\3z\3z\3z\3z\3z\3z\3z\3z\3z\7z\u03ec\nz\fz\16z\u03ef\13z"+
-		"\n{\3|\3|\3|\3|\5|\u03f8\n|\3}\3}\3}\3}\3}\5}\u03ff\n}\3~\3~\5~\u0403"+
+		"\3z\3z\3z\3z\3z\3z\3{\3{\3{\3{\3|\3|\3|\3|\5|\u03ff\n|\3}\3}\3}\3}\5}"+
-		"\n~\3\177\3\177\3\177\3\177\3\u0080\3\u0080\3\u0080\3\u0080\3\u0080\3"+
+		"\u0405\n}\3~\3~\3~\3~\3~\5~\u040c\n~\3\177\3\177\5\177\u0410\n\177\3\u0080"+
-		"\u0080\3\u0081\3\u0081\3\u0081\6\u0081\u0412\n\u0081\r\u0081\16\u0081"+
+		"\3\u0080\3\u0080\3\u0080\3\u0081\3\u0081\3\u0081\3\u0081\3\u0081\3\u0081"+
-		"\u0413\3\u0081\3\u0081\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084\3\u0084"+
+		"\3\u0082\3\u0082\3\u0082\6\u0082\u041f\n\u0082\r\u0082\16\u0082\u0420"+
-		"\5\u0084\u041e\n\u0084\3\u0085\3\u0085\3\u0085\3\u0086\3\u0086\3\u0087"+
+		"\3\u0082\3\u0082\3\u0083\3\u0083\3\u0084\3\u0084\3\u0085\3\u0085\5\u0085"+
-		"\3\u0087\3\u0087\7\u0087\u0428\n\u0087\f\u0087\16\u0087\u042b\13\u0087"+
+		"\u042b\n\u0085\3\u0086\3\u0086\3\u0086\3\u0087\3\u0087\3\u0088\3\u0088"+
-		"\5\u0087\u042d\n\u0087\3\u0088\3\u0088\5\u0088\u0431\n\u0088\3\u0088\6"+
+		"\3\u0088\7\u0088\u0435\n\u0088\f\u0088\16\u0088\u0438\13\u0088\5\u0088"+
-		"\u0088\u0434\n\u0088\r\u0088\16\u0088\u0435\3\u0089\3\u0089\3\u0089\3"+
+		"\u043a\n\u0088\3\u0089\3\u0089\5\u0089\u043e\n\u0089\3\u0089\6\u0089\u0441"+
-		"\u0089\3\u0089\5\u0089\u043d\n\u0089\3\u008a\3\u008a\3\u008a\3\u008a\5"+
+		"\n\u0089\r\u0089\16\u0089\u0442\3\u008a\3\u008a\3\u008a\3\u008a\3\u008a"+
-		"\u008a\u0443\n\u008a\3\u008b\5\u008b\u0446\n\u008b\3\u008c\5\u008c\u0449"+
+		"\5\u008a\u044a\n\u008a\3\u008b\3\u008b\3\u008b\3\u008b\5\u008b\u0450\n"+
-		"\n\u008c\3\u008d\5\u008d\u044c\n\u008d\3\u008e\5\u008e\u044f\n\u008e\3"+
+		"\u008b\3\u008c\5\u008c\u0453\n\u008c\3\u008d\5\u008d\u0456\n\u008d\3\u008e"+
-		"\u008f\3\u008f\3\u008f\3\u008f\7\u008f\u0455\n\u008f\f\u008f\16\u008f"+
+		"\5\u008e\u0459\n\u008e\3\u008f\5\u008f\u045c\n\u008f\3\u0090\3\u0090\3"+
-		"\u0458\13\u008f\3\u008f\5\u008f\u045b\n\u008f\3\u0090\3\u0090\5\u0090"+
+		"\u0090\3\u0090\7\u0090\u0462\n\u0090\f\u0090\16\u0090\u0465\13\u0090\3"+
-		"\u045f\n\u0090\3\u0091\3\u0091\3\u0091\5\u0129\u03ca\u03e0\2\u0092\3\3"+
+		"\u0090\5\u0090\u0468\n\u0090\3\u0091\3\u0091\5\u0091\u046c\n\u0091\3\u0092"+
-		"\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21"+
+		"\3\u0092\3\u0092\5\u012b\u03d7\u03ed\2\u0093\3\3\5\4\7\5\t\6\13\7\r\b"+
-		"!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!"+
+		"\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26"+
-		"A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s"+
+		"+\27-\30/\31\61\32\63\33\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S"+
-		";u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008f"+
+		"+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081"+
-		"I\u0091J\u0093K\u0095L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1R\u00a3"+
+		"B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095"+
-		"S\u00a5T\u00a7U\u00a9V\u00abW\u00adX\u00afY\u00b1Z\u00b3[\u00b5\\\u00b7"+
+		"L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9"+
-		"]\u00b9^\u00bb_\u00bd`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7e\u00c9f\u00cb"+
+		"V\u00abW\u00adX\u00afY\u00b1Z\u00b3[\u00b5\\\u00b7]\u00b9^\u00bb_\u00bd"+
-		"g\u00cdh\u00cfi\u00d1j\u00d3k\u00d5l\u00d7m\u00d9n\u00dbo\u00ddp\u00df"+
+		"`\u00bfa\u00c1b\u00c3c\u00c5d\u00c7e\u00c9f\u00cbg\u00cdh\u00cfi\u00d1"+
-		"q\u00e1r\u00e3s\u00e5t\u00e7u\u00e9v\u00ebw\u00edx\u00efy\u00f1z\u00f3"+
+		"j\u00d3k\u00d5l\u00d7m\u00d9n\u00dbo\u00ddp\u00dfq\u00e1r\u00e3s\u00e5"+
-		"{\u00f5\2\u00f7\2\u00f9\2\u00fb\2\u00fd\2\u00ff\2\u0101\2\u0103\2\u0105"+
+		"t\u00e7u\u00e9v\u00ebw\u00edx\u00efy\u00f1z\u00f3{\u00f5|\u00f7\2\u00f9"+
-		"\2\u0107\2\u0109\2\u010b\2\u010d\2\u010f\2\u0111\2\u0113\2\u0115\2\u0117"+
+		"\2\u00fb\2\u00fd\2\u00ff\2\u0101\2\u0103\2\u0105\2\u0107\2\u0109\2\u010b"+
-		"\2\u0119\2\u011b\2\u011d\2\u011f\2\u0121\2\3\2\33\5\2\f\f\17\17\u202a"+
+		"\2\u010d\2\u010f\2\u0111\2\u0113\2\u0115\2\u0117\2\u0119\2\u011b\2\u011d"+
-		"\u202b\3\2\62;\4\2ZZzz\3\2\629\4\2QQqq\4\2DDdd\3\2\62\63\3\2bb\6\2\13"+
+		"\2\u011f\2\u0121\2\u0123\2\3\2\33\5\2\f\f\17\17\u202a\u202b\3\2\62;\4"+
-		"\13\r\16\"\"\u00a2\u00a2\6\2\f\f\17\17$$^^\6\2\f\f\17\17))^^\13\2$$))"+
+		"\2ZZzz\3\2\629\4\2QQqq\4\2DDdd\3\2\62\63\3\2bb\6\2\13\13\r\16\"\"\u00a2"+
-		"^^ddhhppttvvxx\16\2\f\f\17\17$$))\62;^^ddhhppttvxzz\5\2\62;wwzz\5\2\62"+
+		"\u00a2\6\2\f\f\17\17$$^^\6\2\f\f\17\17))^^\13\2$$))^^ddhhppttvvxx\16\2"+
-		";CHch\3\2\63;\4\2GGgg\4\2--//\4\2&&aa\u0104\2C\\c|\u00ac\u00ac\u00b7\u00b7"+
+		"\f\f\17\17$$))\62;^^ddhhppttvxzz\5\2\62;wwzz\5\2\62;CHch\3\2\63;\4\2G"+
-		"\u00bc\u00bc\u00c2\u00d8\u00da\u00f8\u00fa\u0221\u0224\u0235\u0252\u02af"+
+		"Ggg\4\2--//\4\2&&aa\u0104\2C\\c|\u00ac\u00ac\u00b7\u00b7\u00bc\u00bc\u00c2"+
-		"\u02b2\u02ba\u02bd\u02c3\u02d2\u02d3\u02e2\u02e6\u02f0\u02f0\u037c\u037c"+
+		"\u00d8\u00da\u00f8\u00fa\u0221\u0224\u0235\u0252\u02af\u02b2\u02ba\u02bd"+
-		"\u0388\u0388\u038a\u038c\u038e\u038e\u0390\u03a3\u03a5\u03d0\u03d2\u03d9"+
+		"\u02c3\u02d2\u02d3\u02e2\u02e6\u02f0\u02f0\u037c\u037c\u0388\u0388\u038a"+
-		"\u03dc\u03f5\u0402\u0483\u048e\u04c6\u04c9\u04ca\u04cd\u04ce\u04d2\u04f7"+
+		"\u038c\u038e\u038e\u0390\u03a3\u03a5\u03d0\u03d2\u03d9\u03dc\u03f5\u0402"+
-		"\u04fa\u04fb\u0533\u0558\u055b\u055b\u0563\u0589\u05d2\u05ec\u05f2\u05f4"+
+		"\u0483\u048e\u04c6\u04c9\u04ca\u04cd\u04ce\u04d2\u04f7\u04fa\u04fb\u0533"+
-		"\u0623\u063c\u0642\u064c\u0673\u06d5\u06d7\u06d7\u06e7\u06e8\u06fc\u06fe"+
+		"\u0558\u055b\u055b\u0563\u0589\u05d2\u05ec\u05f2\u05f4\u0623\u063c\u0642"+
-		"\u0712\u0712\u0714\u072e\u0782\u07a7\u0907\u093b\u093f\u093f\u0952\u0952"+
+		"\u064c\u0673\u06d5\u06d7\u06d7\u06e7\u06e8\u06fc\u06fe\u0712\u0712\u0714"+
-		"\u095a\u0963\u0987\u098e\u0991\u0992\u0995\u09aa\u09ac\u09b2\u09b4\u09b4"+
+		"\u072e\u0782\u07a7\u0907\u093b\u093f\u093f\u0952\u0952\u095a\u0963\u0987"+
-		"\u09b8\u09bb\u09de\u09df\u09e1\u09e3\u09f2\u09f3\u0a07\u0a0c\u0a11\u0a12"+
+		"\u098e\u0991\u0992\u0995\u09aa\u09ac\u09b2\u09b4\u09b4\u09b8\u09bb\u09de"+
-		"\u0a15\u0a2a\u0a2c\u0a32\u0a34\u0a35\u0a37\u0a38\u0a3a\u0a3b\u0a5b\u0a5e"+
+		"\u09df\u09e1\u09e3\u09f2\u09f3\u0a07\u0a0c\u0a11\u0a12\u0a15\u0a2a\u0a2c"+
-		"\u0a60\u0a60\u0a74\u0a76\u0a87\u0a8d\u0a8f\u0a8f\u0a91\u0a93\u0a95\u0aaa"+
+		"\u0a32\u0a34\u0a35\u0a37\u0a38\u0a3a\u0a3b\u0a5b\u0a5e\u0a60\u0a60\u0a74"+
-		"\u0aac\u0ab2\u0ab4\u0ab5\u0ab7\u0abb\u0abf\u0abf\u0ad2\u0ad2\u0ae2\u0ae2"+
+		"\u0a76\u0a87\u0a8d\u0a8f\u0a8f\u0a91\u0a93\u0a95\u0aaa\u0aac\u0ab2\u0ab4"+
-		"\u0b07\u0b0e\u0b11\u0b12\u0b15\u0b2a\u0b2c\u0b32\u0b34\u0b35\u0b38\u0b3b"+
+		"\u0ab5\u0ab7\u0abb\u0abf\u0abf\u0ad2\u0ad2\u0ae2\u0ae2\u0b07\u0b0e\u0b11"+
-		"\u0b3f\u0b3f\u0b5e\u0b5f\u0b61\u0b63\u0b87\u0b8c\u0b90\u0b92\u0b94\u0b97"+
+		"\u0b12\u0b15\u0b2a\u0b2c\u0b32\u0b34\u0b35\u0b38\u0b3b\u0b3f\u0b3f\u0b5e"+
-		"\u0b9b\u0b9c\u0b9e\u0b9e\u0ba0\u0ba1\u0ba5\u0ba6\u0baa\u0bac\u0bb0\u0bb7"+
+		"\u0b5f\u0b61\u0b63\u0b87\u0b8c\u0b90\u0b92\u0b94\u0b97\u0b9b\u0b9c\u0b9e"+
-		"\u0bb9\u0bbb\u0c07\u0c0e\u0c10\u0c12\u0c14\u0c2a\u0c2c\u0c35\u0c37\u0c3b"+
+		"\u0b9e\u0ba0\u0ba1\u0ba5\u0ba6\u0baa\u0bac\u0bb0\u0bb7\u0bb9\u0bbb\u0c07"+
-		"\u0c62\u0c63\u0c87\u0c8e\u0c90\u0c92\u0c94\u0caa\u0cac\u0cb5\u0cb7\u0cbb"+
+		"\u0c0e\u0c10\u0c12\u0c14\u0c2a\u0c2c\u0c35\u0c37\u0c3b\u0c62\u0c63\u0c87"+
-		"\u0ce0\u0ce0\u0ce2\u0ce3\u0d07\u0d0e\u0d10\u0d12\u0d14\u0d2a\u0d2c\u0d3b"+
+		"\u0c8e\u0c90\u0c92\u0c94\u0caa\u0cac\u0cb5\u0cb7\u0cbb\u0ce0\u0ce0\u0ce2"+
-		"\u0d62\u0d63\u0d87\u0d98\u0d9c\u0db3\u0db5\u0dbd\u0dbf\u0dbf\u0dc2\u0dc8"+
+		"\u0ce3\u0d07\u0d0e\u0d10\u0d12\u0d14\u0d2a\u0d2c\u0d3b\u0d62\u0d63\u0d87"+
-		"\u0e03\u0e32\u0e34\u0e35\u0e42\u0e48\u0e83\u0e84\u0e86\u0e86\u0e89\u0e8a"+
+		"\u0d98\u0d9c\u0db3\u0db5\u0dbd\u0dbf\u0dbf\u0dc2\u0dc8\u0e03\u0e32\u0e34"+
-		"\u0e8c\u0e8c\u0e8f\u0e8f\u0e96\u0e99\u0e9b\u0ea1\u0ea3\u0ea5\u0ea7\u0ea7"+
+		"\u0e35\u0e42\u0e48\u0e83\u0e84\u0e86\u0e86\u0e89\u0e8a\u0e8c\u0e8c\u0e8f"+
-		"\u0ea9\u0ea9\u0eac\u0ead\u0eaf\u0eb2\u0eb4\u0eb5\u0ebf\u0ec6\u0ec8\u0ec8"+
+		"\u0e8f\u0e96\u0e99\u0e9b\u0ea1\u0ea3\u0ea5\u0ea7\u0ea7\u0ea9\u0ea9\u0eac"+
-		"\u0ede\u0edf\u0f02\u0f02\u0f42\u0f6c\u0f8a\u0f8d\u1002\u1023\u1025\u1029"+
+		"\u0ead\u0eaf\u0eb2\u0eb4\u0eb5\u0ebf\u0ec6\u0ec8\u0ec8\u0ede\u0edf\u0f02"+
-		"\u102b\u102c\u1052\u1057\u10a2\u10c7\u10d2\u10f8\u1102\u115b\u1161\u11a4"+
+		"\u0f02\u0f42\u0f6c\u0f8a\u0f8d\u1002\u1023\u1025\u1029\u102b\u102c\u1052"+
-		"\u11aa\u11fb\u1202\u1208\u120a\u1248\u124a\u124a\u124c\u124f\u1252\u1258"+
+		"\u1057\u10a2\u10c7\u10d2\u10f8\u1102\u115b\u1161\u11a4\u11aa\u11fb\u1202"+
-		"\u125a\u125a\u125c\u125f\u1262\u1288\u128a\u128a\u128c\u128f\u1292\u12b0"+
+		"\u1208\u120a\u1248\u124a\u124a\u124c\u124f\u1252\u1258\u125a\u125a\u125c"+
-		"\u12b2\u12b2\u12b4\u12b7\u12ba\u12c0\u12c2\u12c2\u12c4\u12c7\u12ca\u12d0"+
+		"\u125f\u1262\u1288\u128a\u128a\u128c\u128f\u1292\u12b0\u12b2\u12b2\u12b4"+
-		"\u12d2\u12d8\u12da\u12f0\u12f2\u1310\u1312\u1312\u1314\u1317\u131a\u1320"+
+		"\u12b7\u12ba\u12c0\u12c2\u12c2\u12c4\u12c7\u12ca\u12d0\u12d2\u12d8\u12da"+
-		"\u1322\u1348\u134a\u135c\u13a2\u13f6\u1403\u1678\u1683\u169c\u16a2\u16ec"+
+		"\u12f0\u12f2\u1310\u1312\u1312\u1314\u1317\u131a\u1320\u1322\u1348\u134a"+
-		"\u1782\u17b5\u1822\u1879\u1882\u18aa\u1e02\u1e9d\u1ea2\u1efb\u1f02\u1f17"+
+		"\u135c\u13a2\u13f6\u1403\u1678\u1683\u169c\u16a2\u16ec\u1782\u17b5\u1822"+
-		"\u1f1a\u1f1f\u1f22\u1f47\u1f4a\u1f4f\u1f52\u1f59\u1f5b\u1f5b\u1f5d\u1f5d"+
+		"\u1879\u1882\u18aa\u1e02\u1e9d\u1ea2\u1efb\u1f02\u1f17\u1f1a\u1f1f\u1f22"+
-		"\u1f5f\u1f5f\u1f61\u1f7f\u1f82\u1fb6\u1fb8\u1fbe\u1fc0\u1fc0\u1fc4\u1fc6"+
+		"\u1f47\u1f4a\u1f4f\u1f52\u1f59\u1f5b\u1f5b\u1f5d\u1f5d\u1f5f\u1f5f\u1f61"+
-		"\u1fc8\u1fce\u1fd2\u1fd5\u1fd8\u1fdd\u1fe2\u1fee\u1ff4\u1ff6\u1ff8\u1ffe"+
+		"\u1f7f\u1f82\u1fb6\u1fb8\u1fbe\u1fc0\u1fc0\u1fc4\u1fc6\u1fc8\u1fce\u1fd2"+
-		"\u2081\u2081\u2104\u2104\u2109\u2109\u210c\u2115\u2117\u2117\u211b\u211f"+
+		"\u1fd5\u1fd8\u1fdd\u1fe2\u1fee\u1ff4\u1ff6\u1ff8\u1ffe\u2081\u2081\u2104"+
-		"\u2126\u2126\u2128\u2128\u212a\u212a\u212c\u212f\u2131\u2133\u2135\u213b"+
+		"\u2104\u2109\u2109\u210c\u2115\u2117\u2117\u211b\u211f\u2126\u2126\u2128"+
-		"\u2162\u2185\u3007\u3009\u3023\u302b\u3033\u3037\u303a\u303c\u3043\u3096"+
+		"\u2128\u212a\u212a\u212c\u212f\u2131\u2133\u2135\u213b\u2162\u2185\u3007"+
-		"\u309f\u30a0\u30a3\u30fc\u30fe\u3100\u3107\u312e\u3133\u3190\u31a2\u31b9"+
+		"\u3009\u3023\u302b\u3033\u3037\u303a\u303c\u3043\u3096\u309f\u30a0\u30a3"+
-		"\u3402\u3402\u4db7\u4db7\u4e02\u4e02\u9fa7\u9fa7\ua002\ua48e\uac02\uac02"+
+		"\u30fc\u30fe\u3100\u3107\u312e\u3133\u3190\u31a2\u31b9\u3402\u3402\u4db7"+
-		"\ud7a5\ud7a5\uf902\ufa2f\ufb02\ufb08\ufb15\ufb19\ufb1f\ufb1f\ufb21\ufb2a"+
+		"\u4db7\u4e02\u4e02\u9fa7\u9fa7\ua002\ua48e\uac02\uac02\ud7a5\ud7a5\uf902"+
-		"\ufb2c\ufb38\ufb3a\ufb3e\ufb40\ufb40\ufb42\ufb43\ufb45\ufb46\ufb48\ufbb3"+
+		"\ufa2f\ufb02\ufb08\ufb15\ufb19\ufb1f\ufb1f\ufb21\ufb2a\ufb2c\ufb38\ufb3a"+
-		"\ufbd5\ufd3f\ufd52\ufd91\ufd94\ufdc9\ufdf2\ufdfd\ufe72\ufe74\ufe76\ufe76"+
+		"\ufb3e\ufb40\ufb40\ufb42\ufb43\ufb45\ufb46\ufb48\ufbb3\ufbd5\ufd3f\ufd52"+
-		"\ufe78\ufefe\uff23\uff3c\uff43\uff5c\uff68\uffc0\uffc4\uffc9\uffcc\uffd1"+
+		"\ufd91\ufd94\ufdc9\ufdf2\ufdfd\ufe72\ufe74\ufe76\ufe76\ufe78\ufefe\uff23"+
-		"\uffd4\uffd9\uffdc\uffdef\2\u0302\u0350\u0362\u0364\u0485\u0488\u0593"+
+		"\uff3c\uff43\uff5c\uff68\uffc0\uffc4\uffc9\uffcc\uffd1\uffd4\uffd9\uffdc"+
-		"\u05a3\u05a5\u05bb\u05bd\u05bf\u05c1\u05c1\u05c3\u05c4\u05c6\u05c6\u064d"+
+		"\uffdef\2\u0302\u0350\u0362\u0364\u0485\u0488\u0593\u05a3\u05a5\u05bb"+
-		"\u0657\u0672\u0672\u06d8\u06de\u06e1\u06e6\u06e9\u06ea\u06ec\u06ef\u0713"+
+		"\u05bd\u05bf\u05c1\u05c1\u05c3\u05c4\u05c6\u05c6\u064d\u0657\u0672\u0672"+
-		"\u0713\u0732\u074c\u07a8\u07b2\u0903\u0905\u093e\u093e\u0940\u094f\u0953"+
+		"\u06d8\u06de\u06e1\u06e6\u06e9\u06ea\u06ec\u06ef\u0713\u0713\u0732\u074c"+
-		"\u0956\u0964\u0965\u0983\u0985\u09be\u09c6\u09c9\u09ca\u09cd\u09cf\u09d9"+
+		"\u07a8\u07b2\u0903\u0905\u093e\u093e\u0940\u094f\u0953\u0956\u0964\u0965"+
-		"\u09d9\u09e4\u09e5\u0a04\u0a04\u0a3e\u0a3e\u0a40\u0a44\u0a49\u0a4a\u0a4d"+
+		"\u0983\u0985\u09be\u09c6\u09c9\u09ca\u09cd\u09cf\u09d9\u09d9\u09e4\u09e5"+
-		"\u0a4f\u0a72\u0a73\u0a83\u0a85\u0abe\u0abe\u0ac0\u0ac7\u0ac9\u0acb\u0acd"+
+		"\u0a04\u0a04\u0a3e\u0a3e\u0a40\u0a44\u0a49\u0a4a\u0a4d\u0a4f\u0a72\u0a73"+
-		"\u0acf\u0b03\u0b05\u0b3e\u0b3e\u0b40\u0b45\u0b49\u0b4a\u0b4d\u0b4f\u0b58"+
+		"\u0a83\u0a85\u0abe\u0abe\u0ac0\u0ac7\u0ac9\u0acb\u0acd\u0acf\u0b03\u0b05"+
-		"\u0b59\u0b84\u0b85\u0bc0\u0bc4\u0bc8\u0bca\u0bcc\u0bcf\u0bd9\u0bd9\u0c03"+
+		"\u0b3e\u0b3e\u0b40\u0b45\u0b49\u0b4a\u0b4d\u0b4f\u0b58\u0b59\u0b84\u0b85"+
-		"\u0c05\u0c40\u0c46\u0c48\u0c4a\u0c4c\u0c4f\u0c57\u0c58\u0c84\u0c85\u0cc0"+
+		"\u0bc0\u0bc4\u0bc8\u0bca\u0bcc\u0bcf\u0bd9\u0bd9\u0c03\u0c05\u0c40\u0c46"+
-		"\u0cc6\u0cc8\u0cca\u0ccc\u0ccf\u0cd7\u0cd8\u0d04\u0d05\u0d40\u0d45\u0d48"+
+		"\u0c48\u0c4a\u0c4c\u0c4f\u0c57\u0c58\u0c84\u0c85\u0cc0\u0cc6\u0cc8\u0cca"+
-		"\u0d4a\u0d4c\u0d4f\u0d59\u0d59\u0d84\u0d85\u0dcc\u0dcc\u0dd1\u0dd6\u0dd8"+
+		"\u0ccc\u0ccf\u0cd7\u0cd8\u0d04\u0d05\u0d40\u0d45\u0d48\u0d4a\u0d4c\u0d4f"+
-		"\u0dd8\u0dda\u0de1\u0df4\u0df5\u0e33\u0e33\u0e36\u0e3c\u0e49\u0e50\u0eb3"+
+		"\u0d59\u0d59\u0d84\u0d85\u0dcc\u0dcc\u0dd1\u0dd6\u0dd8\u0dd8\u0dda\u0de1"+
-		"\u0eb3\u0eb6\u0ebb\u0ebd\u0ebe\u0eca\u0ecf\u0f1a\u0f1b\u0f37\u0f37\u0f39"+
+		"\u0df4\u0df5\u0e33\u0e33\u0e36\u0e3c\u0e49\u0e50\u0eb3\u0eb3\u0eb6\u0ebb"+
-		"\u0f39\u0f3b\u0f3b\u0f40\u0f41\u0f73\u0f86\u0f88\u0f89\u0f92\u0f99\u0f9b"+
+		"\u0ebd\u0ebe\u0eca\u0ecf\u0f1a\u0f1b\u0f37\u0f37\u0f39\u0f39\u0f3b\u0f3b"+
-		"\u0fbe\u0fc8\u0fc8\u102e\u1034\u1038\u103b\u1058\u105b\u17b6\u17d5\u18ab"+
+		"\u0f40\u0f41\u0f73\u0f86\u0f88\u0f89\u0f92\u0f99\u0f9b\u0fbe\u0fc8\u0fc8"+
-		"\u18ab\u20d2\u20de\u20e3\u20e3\u302c\u3031\u309b\u309c\ufb20\ufb20\ufe22"+
+		"\u102e\u1034\u1038\u103b\u1058\u105b\u17b6\u17d5\u18ab\u18ab\u20d2\u20de"+
-		"\ufe25\26\2\62;\u0662\u066b\u06f2\u06fb\u0968\u0971\u09e8\u09f1\u0a68"+
+		"\u20e3\u20e3\u302c\u3031\u309b\u309c\ufb20\ufb20\ufe22\ufe25\26\2\62;"+
-		"\u0a71\u0ae8\u0af1\u0b68\u0b71\u0be9\u0bf1\u0c68\u0c71\u0ce8\u0cf1\u0d68"+
+		"\u0662\u066b\u06f2\u06fb\u0968\u0971\u09e8\u09f1\u0a68\u0a71\u0ae8\u0af1"+
-		"\u0d71\u0e52\u0e5b\u0ed2\u0edb\u0f22\u0f2b\u1042\u104b\u136b\u1373\u17e2"+
+		"\u0b68\u0b71\u0be9\u0bf1\u0c68\u0c71\u0ce8\u0cf1\u0d68\u0d71\u0e52\u0e5b"+
-		"\u17eb\u1812\u181b\uff12\uff1b\t\2aa\u2041\u2042\u30fd\u30fd\ufe35\ufe36"+
+		"\u0ed2\u0edb\u0f22\u0f2b\u1042\u104b\u136b\u1373\u17e2\u17eb\u1812\u181b"+
-		"\ufe4f\ufe51\uff41\uff41\uff67\uff67\7\2\f\f\17\17\61\61]^\u202a\u202b"+
+		"\uff12\uff1b\t\2aa\u2041\u2042\u30fd\u30fd\ufe35\ufe36\ufe4f\ufe51\uff41"+
-		"\6\2\f\f\17\17^_\u202a\u202b\2\u047d\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2"+
+		"\uff41\uff67\uff67\7\2\f\f\17\17\61\61]^\u202a\u202b\6\2\f\f\17\17^_\u202a"+
-		"\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23"+
+		"\u202b\2\u048a\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3"+
-		"\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2"+
+		"\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2"+
-		"\2\2\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2"+
+		"\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3"+
-		"\2\2\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3"+
+		"\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2"+
-		"\2\2\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2"+
+		"\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\2"+
-		"\2\2\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2"+
+		"9\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3"+
-		"\2O\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2["+
+		"\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2"+
-		"\3\2\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2"+
+		"\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2"+
-		"\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2"+
+		"_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3"+
-		"\2u\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2"+
+		"\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2"+
-		"\2\u0081\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089"+
+		"\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083"+
-		"\3\2\2\2\2\u008b\3\2\2\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091\3\2\2"+
+		"\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\2\u0089\3\2\2\2\2\u008b\3\2\2"+
-		"\2\2\u0093\3\2\2\2\2\u0095\3\2\2\2\2\u0097\3\2\2\2\2\u0099\3\2\2\2\2\u009b"+
+		"\2\2\u008d\3\2\2\2\2\u008f\3\2\2\2\2\u0091\3\2\2\2\2\u0093\3\2\2\2\2\u0095"+
-		"\3\2\2\2\2\u009d\3\2\2\2\2\u009f\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3\3\2\2"+
+		"\3\2\2\2\2\u0097\3\2\2\2\2\u0099\3\2\2\2\2\u009b\3\2\2\2\2\u009d\3\2\2"+
-		"\2\2\u00a5\3\2\2\2\2\u00a7\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab\3\2\2\2\2\u00ad"+
+		"\2\2\u009f\3\2\2\2\2\u00a1\3\2\2\2\2\u00a3\3\2\2\2\2\u00a5\3\2\2\2\2\u00a7"+
-		"\3\2\2\2\2\u00af\3\2\2\2\2\u00b1\3\2\2\2\2\u00b3\3\2\2\2\2\u00b5\3\2\2"+
+		"\3\2\2\2\2\u00a9\3\2\2\2\2\u00ab\3\2\2\2\2\u00ad\3\2\2\2\2\u00af\3\2\2"+
-		"\2\2\u00b7\3\2\2\2\2\u00b9\3\2\2\2\2\u00bb\3\2\2\2\2\u00bd\3\2\2\2\2\u00bf"+
+		"\2\2\u00b1\3\2\2\2\2\u00b3\3\2\2\2\2\u00b5\3\2\2\2\2\u00b7\3\2\2\2\2\u00b9"+
-		"\3\2\2\2\2\u00c1\3\2\2\2\2\u00c3\3\2\2\2\2\u00c5\3\2\2\2\2\u00c7\3\2\2"+
+		"\3\2\2\2\2\u00bb\3\2\2\2\2\u00bd\3\2\2\2\2\u00bf\3\2\2\2\2\u00c1\3\2\2"+
-		"\2\2\u00c9\3\2\2\2\2\u00cb\3\2\2\2\2\u00cd\3\2\2\2\2\u00cf\3\2\2\2\2\u00d1"+
+		"\2\2\u00c3\3\2\2\2\2\u00c5\3\2\2\2\2\u00c7\3\2\2\2\2\u00c9\3\2\2\2\2\u00cb"+
-		"\3\2\2\2\2\u00d3\3\2\2\2\2\u00d5\3\2\2\2\2\u00d7\3\2\2\2\2\u00d9\3\2\2"+
+		"\3\2\2\2\2\u00cd\3\2\2\2\2\u00cf\3\2\2\2\2\u00d1\3\2\2\2\2\u00d3\3\2\2"+
-		"\2\2\u00db\3\2\2\2\2\u00dd\3\2\2\2\2\u00df\3\2\2\2\2\u00e1\3\2\2\2\2\u00e3"+
+		"\2\2\u00d5\3\2\2\2\2\u00d7\3\2\2\2\2\u00d9\3\2\2\2\2\u00db\3\2\2\2\2\u00dd"+
-		"\3\2\2\2\2\u00e5\3\2\2\2\2\u00e7\3\2\2\2\2\u00e9\3\2\2\2\2\u00eb\3\2\2"+
+		"\3\2\2\2\2\u00df\3\2\2\2\2\u00e1\3\2\2\2\2\u00e3\3\2\2\2\2\u00e5\3\2\2"+
-		"\2\2\u00ed\3\2\2\2\2\u00ef\3\2\2\2\2\u00f1\3\2\2\2\2\u00f3\3\2\2\2\3\u0123"+
+		"\2\2\u00e7\3\2\2\2\2\u00e9\3\2\2\2\2\u00eb\3\2\2\2\2\u00ed\3\2\2\2\2\u00ef"+
-		"\3\2\2\2\5\u0131\3\2\2\2\7\u013c\3\2\2\2\t\u014a\3\2\2\2\13\u014c\3\2"+
+		"\3\2\2\2\2\u00f1\3\2\2\2\2\u00f3\3\2\2\2\2\u00f5\3\2\2\2\3\u0125\3\2\2"+
-		"\2\2\r\u014e\3\2\2\2\17\u0150\3\2\2\2\21\u0152\3\2\2\2\23\u0155\3\2\2"+
+		"\2\5\u0133\3\2\2\2\7\u013e\3\2\2\2\t\u014c\3\2\2\2\13\u014e\3\2\2\2\r"+
-		"\2\25\u0158\3\2\2\2\27\u015a\3\2\2\2\31\u015c\3\2\2\2\33\u015e\3\2\2\2"+
+		"\u0150\3\2\2\2\17\u0152\3\2\2\2\21\u0154\3\2\2\2\23\u0157\3\2\2\2\25\u015a"+
-		"\35\u0160\3\2\2\2\37\u0162\3\2\2\2!\u0166\3\2\2\2#\u0168\3\2\2\2%\u016b"+
+		"\3\2\2\2\27\u015c\3\2\2\2\31\u015e\3\2\2\2\33\u0160\3\2\2\2\35\u0162\3"+
-		"\3\2\2\2\'\u016e\3\2\2\2)\u0170\3\2\2\2+\u0172\3\2\2\2-\u0174\3\2\2\2"+
+		"\2\2\2\37\u0164\3\2\2\2!\u0168\3\2\2\2#\u016a\3\2\2\2%\u016d\3\2\2\2\'"+
-		"/\u0176\3\2\2\2\61\u0178\3\2\2\2\63\u017a\3\2\2\2\65\u017c\3\2\2\2\67"+
+		"\u0170\3\2\2\2)\u0172\3\2\2\2+\u0174\3\2\2\2-\u0176\3\2\2\2/\u0178\3\2"+
-		"\u017f\3\2\2\29\u0182\3\2\2\2;\u0186\3\2\2\2=\u0188\3\2\2\2?\u018a\3\2"+
+		"\2\2\61\u017a\3\2\2\2\63\u017c\3\2\2\2\65\u017e\3\2\2\2\67\u0181\3\2\2"+
-		"\2\2A\u018d\3\2\2\2C\u0190\3\2\2\2E\u0193\3\2\2\2G\u0196\3\2\2\2I\u019a"+
+		"\29\u0184\3\2\2\2;\u0188\3\2\2\2=\u018a\3\2\2\2?\u018c\3\2\2\2A\u018f"+
-		"\3\2\2\2K\u019e\3\2\2\2M\u01a0\3\2\2\2O\u01a2\3\2\2\2Q\u01a4\3\2\2\2S"+
+		"\3\2\2\2C\u0192\3\2\2\2E\u0195\3\2\2\2G\u0198\3\2\2\2I\u019c\3\2\2\2K"+
-		"\u01a7\3\2\2\2U\u01aa\3\2\2\2W\u01ad\3\2\2\2Y\u01b0\3\2\2\2[\u01b3\3\2"+
+		"\u01a0\3\2\2\2M\u01a2\3\2\2\2O\u01a4\3\2\2\2Q\u01a6\3\2\2\2S\u01a9\3\2"+
-		"\2\2]\u01b6\3\2\2\2_\u01b9\3\2\2\2a\u01bd\3\2\2\2c\u01c1\3\2\2\2e\u01c6"+
+		"\2\2U\u01ac\3\2\2\2W\u01af\3\2\2\2Y\u01b2\3\2\2\2[\u01b5\3\2\2\2]\u01b8"+
-		"\3\2\2\2g\u01c9\3\2\2\2i\u01cc\3\2\2\2k\u01cf\3\2\2\2m\u01d2\3\2\2\2o"+
+		"\3\2\2\2_\u01bb\3\2\2\2a\u01bf\3\2\2\2c\u01c3\3\2\2\2e\u01c8\3\2\2\2g"+
-		"\u01e0\3\2\2\2q\u01fa\3\2\2\2s\u01fc\3\2\2\2u\u0203\3\2\2\2w\u020b\3\2"+
+		"\u01cb\3\2\2\2i\u01ce\3\2\2\2k\u01d1\3\2\2\2m\u01d4\3\2\2\2o\u01e2\3\2"+
-		"\2\2y\u0212\3\2\2\2{\u0219\3\2\2\2}\u021f\3\2\2\2\177\u0222\3\2\2\2\u0081"+
+		"\2\2q\u01fc\3\2\2\2s\u01fe\3\2\2\2u\u0205\3\2\2\2w\u020d\3\2\2\2y\u0214"+
-		"\u022d\3\2\2\2\u0083\u0234\3\2\2\2\u0085\u0239\3\2\2\2\u0087\u023e\3\2"+
+		"\3\2\2\2{\u021b\3\2\2\2}\u0221\3\2\2\2\177\u0224\3\2\2\2\u0081\u022f\3"+
-		"\2\2\u0089\u0242\3\2\2\2\u008b\u0246\3\2\2\2\u008d\u024c\3\2\2\2\u008f"+
+		"\2\2\2\u0083\u0236\3\2\2\2\u0085\u023b\3\2\2\2\u0087\u0240\3\2\2\2\u0089"+
-		"\u0254\3\2\2\2\u0091\u025b\3\2\2\2\u0093\u0260\3\2\2\2\u0095\u0269\3\2"+
+		"\u0244\3\2\2\2\u008b\u0248\3\2\2\2\u008d\u024e\3\2\2\2\u008f\u0256\3\2"+
-		"\2\2\u0097\u026d\3\2\2\2\u0099\u0274\3\2\2\2\u009b\u027a\3\2\2\2\u009d"+
+		"\2\2\u0091\u025d\3\2\2\2\u0093\u0262\3\2\2\2\u0095\u026b\3\2\2\2\u0097"+
-		"\u0283\3\2\2\2\u009f\u028c\3\2\2\2\u00a1\u0291\3\2\2\2\u00a3\u0296\3\2"+
+		"\u026f\3\2\2\2\u0099\u0276\3\2\2\2\u009b\u027c\3\2\2\2\u009d\u0285\3\2"+
-		"\2\2\u00a5\u029e\3\2\2\2\u00a7\u02a1\3\2\2\2\u00a9\u02a7\3\2\2\2\u00ab"+
+		"\2\2\u009f\u028e\3\2\2\2\u00a1\u0293\3\2\2\2\u00a3\u0298\3\2\2\2\u00a5"+
-		"\u02ae\3\2\2\2\u00ad\u02b1\3\2\2\2\u00af\u02b5\3\2\2\2\u00b1\u02bb\3\2"+
+		"\u02a0\3\2\2\2\u00a7\u02a3\3\2\2\2\u00a9\u02a9\3\2\2\2\u00ab\u02b0\3\2"+
-		"\2\2\u00b3\u02bd\3\2\2\2\u00b5\u02cb\3\2\2\2\u00b7\u02d8\3\2\2\2\u00b9"+
+		"\2\2\u00ad\u02b3\3\2\2\2\u00af\u02b7\3\2\2\2\u00b1\u02bd\3\2\2\2\u00b3"+
-		"\u02e2\3\2\2\2\u00bb\u02e9\3\2\2\2\u00bd\u02ef\3\2\2\2\u00bf\u02f4\3\2"+
+		"\u02bf\3\2\2\2\u00b5\u02cd\3\2\2\2\u00b7\u02da\3\2\2\2\u00b9\u02e4\3\2"+
-		"\2\2\u00c1\u02fa\3\2\2\2\u00c3\u02ff\3\2\2\2\u00c5\u0307\3\2\2\2\u00c7"+
+		"\2\2\u00bb\u02eb\3\2\2\2\u00bd\u02f1\3\2\2\2\u00bf\u02f6\3\2\2\2\u00c1"+
-		"\u030d\3\2\2\2\u00c9\u0313\3\2\2\2\u00cb\u031a\3\2\2\2\u00cd\u0321\3\2"+
+		"\u02fc\3\2\2\2\u00c3\u0301\3\2\2\2\u00c5\u0309\3\2\2\2\u00c7\u030f\3\2"+
-		"\2\2\u00cf\u032a\3\2\2\2\u00d1\u0331\3\2\2\2\u00d3\u0338\3\2\2\2\u00d5"+
+		"\2\2\u00c9\u0315\3\2\2\2\u00cb\u031c\3\2\2\2\u00cd\u0323\3\2\2\2\u00cf"+
-		"\u0345\3\2\2\2\u00d7\u034b\3\2\2\2\u00d9\u0355\3\2\2\2\u00db\u035e\3\2"+
+		"\u032c\3\2\2\2\u00d1\u0333\3\2\2\2\u00d3\u033a\3\2\2\2\u00d5\u0345\3\2"+
-		"\2\2\u00dd\u036a\3\2\2\2\u00df\u0374\3\2\2\2\u00e1\u0380\3\2\2\2\u00e3"+
+		"\2\2\u00d7\u0352\3\2\2\2\u00d9\u0358\3\2\2\2\u00db\u0362\3\2\2\2\u00dd"+
-		"\u0389\3\2\2\2\u00e5\u0391\3\2\2\2\u00e7\u03a8\3\2\2\2\u00e9\u03ac\3\2"+
+		"\u036b\3\2\2\2\u00df\u0377\3\2\2\2\u00e1\u0381\3\2\2\2\u00e3\u038d\3\2"+
-		"\2\2\u00eb\u03b8\3\2\2\2\u00ed\u03be\3\2\2\2\u00ef\u03c2\3\2\2\2\u00f1"+
+		"\2\2\u00e5\u0396\3\2\2\2\u00e7\u039e\3\2\2\2\u00e9\u03b5\3\2\2\2\u00eb"+
-		"\u03d3\3\2\2\2\u00f3\u03e9\3\2\2\2\u00f5\u03f1\3\2\2\2\u00f7\u03f7\3\2"+
+		"\u03b9\3\2\2\2\u00ed\u03c5\3\2\2\2\u00ef\u03cb\3\2\2\2\u00f1\u03cf\3\2"+
-		"\2\2\u00f9\u03fe\3\2\2\2\u00fb\u0402\3\2\2\2\u00fd\u0404\3\2\2\2\u00ff"+
+		"\2\2\u00f3\u03e0\3\2\2\2\u00f5\u03f6\3\2\2\2\u00f7\u03fe\3\2\2\2\u00f9"+
-		"\u0408\3\2\2\2\u0101\u040e\3\2\2\2\u0103\u0417\3\2\2\2\u0105\u0419\3\2"+
+		"\u0404\3\2\2\2\u00fb\u040b\3\2\2\2\u00fd\u040f\3\2\2\2\u00ff\u0411\3\2"+
-		"\2\2\u0107\u041d\3\2\2\2\u0109\u041f\3\2\2\2\u010b\u0422\3\2\2\2\u010d"+
+		"\2\2\u0101\u0415\3\2\2\2\u0103\u041b\3\2\2\2\u0105\u0424\3\2\2\2\u0107"+
-		"\u042c\3\2\2\2\u010f\u042e\3\2\2\2\u0111\u043c\3\2\2\2\u0113\u0442\3\2"+
+		"\u0426\3\2\2\2\u0109\u042a\3\2\2\2\u010b\u042c\3\2\2\2\u010d\u042f\3\2"+
-		"\2\2\u0115\u0445\3\2\2\2\u0117\u0448\3\2\2\2\u0119\u044b\3\2\2\2\u011b"+
+		"\2\2\u010f\u0439\3\2\2\2\u0111\u043b\3\2\2\2\u0113\u0449\3\2\2\2\u0115"+
-		"\u044e\3\2\2\2\u011d\u045a\3\2\2\2\u011f\u045e\3\2\2\2\u0121\u0460\3\2"+
+		"\u044f\3\2\2\2\u0117\u0452\3\2\2\2\u0119\u0455\3\2\2\2\u011b\u0458\3\2"+
-		"\2\2\u0123\u0124\7\61\2\2\u0124\u0125\7,\2\2\u0125\u0129\3\2\2\2\u0126"+
+		"\2\2\u011d\u045b\3\2\2\2\u011f\u0467\3\2\2\2\u0121\u046b\3\2\2\2\u0123"+
-		"\u0128\13\2\2\2\u0127\u0126\3\2\2\2\u0128\u012b\3\2\2\2\u0129\u012a\3"+
+		"\u046d\3\2\2\2\u0125\u0126\7\61\2\2\u0126\u0127\7,\2\2\u0127\u012b\3\2"+
-		"\2\2\2\u0129\u0127\3\2\2\2\u012a\u012c\3\2\2\2\u012b\u0129\3\2\2\2\u012c"+
+		"\2\2\u0128\u012a\13\2\2\2\u0129\u0128\3\2\2\2\u012a\u012d\3\2\2\2\u012b"+
-		"\u012d\7,\2\2\u012d\u012e\7\61\2\2\u012e\u012f\3\2\2\2\u012f\u0130\b\2"+
+		"\u012c\3\2\2\2\u012b\u0129\3\2\2\2\u012c\u012e\3\2\2\2\u012d\u012b\3\2"+
-		"\2\2\u0130\4\3\2\2\2\u0131\u0132\7\61\2\2\u0132\u0133\7\61\2\2\u0133\u0137"+
+		"\2\2\u012e\u012f\7,\2\2\u012f\u0130\7\61\2\2\u0130\u0131\3\2\2\2\u0131"+
-		"\3\2\2\2\u0134\u0136\n\2\2\2\u0135\u0134\3\2\2\2\u0136\u0139\3\2\2\2\u0137"+
+		"\u0132\b\2\2\2\u0132\4\3\2\2\2\u0133\u0134\7\61\2\2\u0134\u0135\7\61\2"+
-		"\u0135\3\2\2\2\u0137\u0138\3\2\2\2\u0138\u013a\3\2\2\2\u0139\u0137\3\2"+
+		"\2\u0135\u0139\3\2\2\2\u0136\u0138\n\2\2\2\u0137\u0136\3\2\2\2\u0138\u013b"+
-		"\2\2\u013a\u013b\b\3\2\2\u013b\6\3\2\2\2\u013c\u013e\7\61\2\2\u013d\u013f"+
+		"\3\2\2\2\u0139\u0137\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u013c\3\2\2\2\u013b"+
-		"\5\u011d\u008f\2\u013e\u013d\3\2\2\2\u013f\u0140\3\2\2\2\u0140\u013e\3"+
+		"\u0139\3\2\2\2\u013c\u013d\b\3\2\2\u013d\6\3\2\2\2\u013e\u0140\7\61\2"+
-		"\2\2\2\u0140\u0141\3\2\2\2\u0141\u0142\3\2\2\2\u0142\u0143\6\4\2\2\u0143"+
+		"\2\u013f\u0141\5\u011f\u0090\2\u0140\u013f\3\2\2\2\u0141\u0142\3\2\2\2"+
-		"\u0147\7\61\2\2\u0144\u0146\5\u0111\u0089\2\u0145\u0144\3\2\2\2\u0146"+
+		"\u0142\u0140\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0144\3\2\2\2\u0144\u0145"+
-		"\u0149\3\2\2\2\u0147\u0145\3\2\2\2\u0147\u0148\3\2\2\2\u0148\b\3\2\2\2"+
+		"\6\4\2\2\u0145\u0149\7\61\2\2\u0146\u0148\5\u0113\u008a\2\u0147\u0146"+
-		"\u0149\u0147\3\2\2\2\u014a\u014b\7]\2\2\u014b\n\3\2\2\2\u014c\u014d\7"+
+		"\3\2\2\2\u0148\u014b\3\2\2\2\u0149\u0147\3\2\2\2\u0149\u014a\3\2\2\2\u014a"+
-		"_\2\2\u014d\f\3\2\2\2\u014e\u014f\7*\2\2\u014f\16\3\2\2\2\u0150\u0151"+
+		"\b\3\2\2\2\u014b\u0149\3\2\2\2\u014c\u014d\7]\2\2\u014d\n\3\2\2\2\u014e"+
-		"\7+\2\2\u0151\20\3\2\2\2\u0152\u0153\7}\2\2\u0153\u0154\b\t\3\2\u0154"+
+		"\u014f\7_\2\2\u014f\f\3\2\2\2\u0150\u0151\7*\2\2\u0151\16\3\2\2\2\u0152"+
-		"\22\3\2\2\2\u0155\u0156\7\177\2\2\u0156\u0157\b\n\4\2\u0157\24\3\2\2\2"+
+		"\u0153\7+\2\2\u0153\20\3\2\2\2\u0154\u0155\7}\2\2\u0155\u0156\b\t\3\2"+
-		"\u0158\u0159\7=\2\2\u0159\26\3\2\2\2\u015a\u015b\7.\2\2\u015b\30\3\2\2"+
+		"\u0156\22\3\2\2\2\u0157\u0158\7\177\2\2\u0158\u0159\b\n\4\2\u0159\24\3"+
-		"\2\u015c\u015d\7?\2\2\u015d\32\3\2\2\2\u015e\u015f\7A\2\2\u015f\34\3\2"+
+		"\2\2\2\u015a\u015b\7=\2\2\u015b\26\3\2\2\2\u015c\u015d\7.\2\2\u015d\30"+
-		"\2\2\u0160\u0161\7<\2\2\u0161\36\3\2\2\2\u0162\u0163\7\60\2\2\u0163\u0164"+
+		"\3\2\2\2\u015e\u015f\7?\2\2\u015f\32\3\2\2\2\u0160\u0161\7A\2\2\u0161"+
-		"\7\60\2\2\u0164\u0165\7\60\2\2\u0165 \3\2\2\2\u0166\u0167\7\60\2\2\u0167"+
+		"\34\3\2\2\2\u0162\u0163\7<\2\2\u0163\36\3\2\2\2\u0164\u0165\7\60\2\2\u0165"+
-		"\"\3\2\2\2\u0168\u0169\7-\2\2\u0169\u016a\7-\2\2\u016a$\3\2\2\2\u016b"+
+		"\u0166\7\60\2\2\u0166\u0167\7\60\2\2\u0167 \3\2\2\2\u0168\u0169\7\60\2"+
-		"\u016c\7/\2\2\u016c\u016d\7/\2\2\u016d&\3\2\2\2\u016e\u016f\7-\2\2\u016f"+
+		"\2\u0169\"\3\2\2\2\u016a\u016b\7-\2\2\u016b\u016c\7-\2\2\u016c$\3\2\2"+
-		"(\3\2\2\2\u0170\u0171\7/\2\2\u0171*\3\2\2\2\u0172\u0173\7\u0080\2\2\u0173"+
+		"\2\u016d\u016e\7/\2\2\u016e\u016f\7/\2\2\u016f&\3\2\2\2\u0170\u0171\7"+
-		",\3\2\2\2\u0174\u0175\7#\2\2\u0175.\3\2\2\2\u0176\u0177\7,\2\2\u0177\60"+
+		"-\2\2\u0171(\3\2\2\2\u0172\u0173\7/\2\2\u0173*\3\2\2\2\u0174\u0175\7\u0080"+
-		"\3\2\2\2\u0178\u0179\7\61\2\2\u0179\62\3\2\2\2\u017a\u017b\7\'\2\2\u017b"+
+		"\2\2\u0175,\3\2\2\2\u0176\u0177\7#\2\2\u0177.\3\2\2\2\u0178\u0179\7,\2"+
-		"\64\3\2\2\2\u017c\u017d\7@\2\2\u017d\u017e\7@\2\2\u017e\66\3\2\2\2\u017f"+
+		"\2\u0179\60\3\2\2\2\u017a\u017b\7\61\2\2\u017b\62\3\2\2\2\u017c\u017d"+
-		"\u0180\7>\2\2\u0180\u0181\7>\2\2\u01818\3\2\2\2\u0182\u0183\7@\2\2\u0183"+
+		"\7\'\2\2\u017d\64\3\2\2\2\u017e\u017f\7@\2\2\u017f\u0180\7@\2\2\u0180"+
-		"\u0184\7@\2\2\u0184\u0185\7@\2\2\u0185:\3\2\2\2\u0186\u0187\7>\2\2\u0187"+
+		"\66\3\2\2\2\u0181\u0182\7>\2\2\u0182\u0183\7>\2\2\u01838\3\2\2\2\u0184"+
-		"<\3\2\2\2\u0188\u0189\7@\2\2\u0189>\3\2\2\2\u018a\u018b\7>\2\2\u018b\u018c"+
+		"\u0185\7@\2\2\u0185\u0186\7@\2\2\u0186\u0187\7@\2\2\u0187:\3\2\2\2\u0188"+
-		"\7?\2\2\u018c@\3\2\2\2\u018d\u018e\7@\2\2\u018e\u018f\7?\2\2\u018fB\3"+
+		"\u0189\7>\2\2\u0189<\3\2\2\2\u018a\u018b\7@\2\2\u018b>\3\2\2\2\u018c\u018d"+
-		"\2\2\2\u0190\u0191\7?\2\2\u0191\u0192\7?\2\2\u0192D\3\2\2\2\u0193\u0194"+
+		"\7>\2\2\u018d\u018e\7?\2\2\u018e@\3\2\2\2\u018f\u0190\7@\2\2\u0190\u0191"+
-		"\7#\2\2\u0194\u0195\7?\2\2\u0195F\3\2\2\2\u0196\u0197\7?\2\2\u0197\u0198"+
+		"\7?\2\2\u0191B\3\2\2\2\u0192\u0193\7?\2\2\u0193\u0194\7?\2\2\u0194D\3"+
-		"\7?\2\2\u0198\u0199\7?\2\2\u0199H\3\2\2\2\u019a\u019b\7#\2\2\u019b\u019c"+
+		"\2\2\2\u0195\u0196\7#\2\2\u0196\u0197\7?\2\2\u0197F\3\2\2\2\u0198\u0199"+
-		"\7?\2\2\u019c\u019d\7?\2\2\u019dJ\3\2\2\2\u019e\u019f\7(\2\2\u019fL\3"+
+		"\7?\2\2\u0199\u019a\7?\2\2\u019a\u019b\7?\2\2\u019bH\3\2\2\2\u019c\u019d"+
-		"\2\2\2\u01a0\u01a1\7`\2\2\u01a1N\3\2\2\2\u01a2\u01a3\7~\2\2\u01a3P\3\2"+
+		"\7#\2\2\u019d\u019e\7?\2\2\u019e\u019f\7?\2\2\u019fJ\3\2\2\2\u01a0\u01a1"+
-		"\2\2\u01a4\u01a5\7(\2\2\u01a5\u01a6\7(\2\2\u01a6R\3\2\2\2\u01a7\u01a8"+
+		"\7(\2\2\u01a1L\3\2\2\2\u01a2\u01a3\7`\2\2\u01a3N\3\2\2\2\u01a4\u01a5\7"+
-		"\7~\2\2\u01a8\u01a9\7~\2\2\u01a9T\3\2\2\2\u01aa\u01ab\7,\2\2\u01ab\u01ac"+
+		"~\2\2\u01a5P\3\2\2\2\u01a6\u01a7\7(\2\2\u01a7\u01a8\7(\2\2\u01a8R\3\2"+
-		"\7?\2\2\u01acV\3\2\2\2\u01ad\u01ae\7\61\2\2\u01ae\u01af\7?\2\2\u01afX"+
+		"\2\2\u01a9\u01aa\7~\2\2\u01aa\u01ab\7~\2\2\u01abT\3\2\2\2\u01ac\u01ad"+
-		"\3\2\2\2\u01b0\u01b1\7\'\2\2\u01b1\u01b2\7?\2\2\u01b2Z\3\2\2\2\u01b3\u01b4"+
+		"\7,\2\2\u01ad\u01ae\7?\2\2\u01aeV\3\2\2\2\u01af\u01b0\7\61\2\2\u01b0\u01b1"+
-		"\7-\2\2\u01b4\u01b5\7?\2\2\u01b5\\\3\2\2\2\u01b6\u01b7\7/\2\2\u01b7\u01b8"+
+		"\7?\2\2\u01b1X\3\2\2\2\u01b2\u01b3\7\'\2\2\u01b3\u01b4\7?\2\2\u01b4Z\3"+
-		"\7?\2\2\u01b8^\3\2\2\2\u01b9\u01ba\7>\2\2\u01ba\u01bb\7>\2\2\u01bb\u01bc"+
+		"\2\2\2\u01b5\u01b6\7-\2\2\u01b6\u01b7\7?\2\2\u01b7\\\3\2\2\2\u01b8\u01b9"+
-		"\7?\2\2\u01bc`\3\2\2\2\u01bd\u01be\7@\2\2\u01be\u01bf\7@\2\2\u01bf\u01c0"+
+		"\7/\2\2\u01b9\u01ba\7?\2\2\u01ba^\3\2\2\2\u01bb\u01bc\7>\2\2\u01bc\u01bd"+
-		"\7?\2\2\u01c0b\3\2\2\2\u01c1\u01c2\7@\2\2\u01c2\u01c3\7@\2\2\u01c3\u01c4"+
+		"\7>\2\2\u01bd\u01be\7?\2\2\u01be`\3\2\2\2\u01bf\u01c0\7@\2\2\u01c0\u01c1"+
-		"\7@\2\2\u01c4\u01c5\7?\2\2\u01c5d\3\2\2\2\u01c6\u01c7\7(\2\2\u01c7\u01c8"+
+		"\7@\2\2\u01c1\u01c2\7?\2\2\u01c2b\3\2\2\2\u01c3\u01c4\7@\2\2\u01c4\u01c5"+
-		"\7?\2\2\u01c8f\3\2\2\2\u01c9\u01ca\7`\2\2\u01ca\u01cb\7?\2\2\u01cbh\3"+
+		"\7@\2\2\u01c5\u01c6\7@\2\2\u01c6\u01c7\7?\2\2\u01c7d\3\2\2\2\u01c8\u01c9"+
-		"\2\2\2\u01cc\u01cd\7~\2\2\u01cd\u01ce\7?\2\2\u01cej\3\2\2\2\u01cf\u01d0"+
+		"\7(\2\2\u01c9\u01ca\7?\2\2\u01caf\3\2\2\2\u01cb\u01cc\7`\2\2\u01cc\u01cd"+
-		"\7?\2\2\u01d0\u01d1\7@\2\2\u01d1l\3\2\2\2\u01d2\u01d3\7p\2\2\u01d3\u01d4"+
+		"\7?\2\2\u01cdh\3\2\2\2\u01ce\u01cf\7~\2\2\u01cf\u01d0\7?\2\2\u01d0j\3"+
-		"\7w\2\2\u01d4\u01d5\7n\2\2\u01d5\u01d6\7n\2\2\u01d6n\3\2\2\2\u01d7\u01d8"+
+		"\2\2\2\u01d1\u01d2\7?\2\2\u01d2\u01d3\7@\2\2\u01d3l\3\2\2\2\u01d4\u01d5"+
-		"\7v\2\2\u01d8\u01d9\7t\2\2\u01d9\u01da\7w\2\2\u01da\u01e1\7g\2\2\u01db"+
+		"\7p\2\2\u01d5\u01d6\7w\2\2\u01d6\u01d7\7n\2\2\u01d7\u01d8\7n\2\2\u01d8"+
-		"\u01dc\7h\2\2\u01dc\u01dd\7c\2\2\u01dd\u01de\7n\2\2\u01de\u01df\7u\2\2"+
+		"n\3\2\2\2\u01d9\u01da\7v\2\2\u01da\u01db\7t\2\2\u01db\u01dc\7w\2\2\u01dc"+
-		"\u01df\u01e1\7g\2\2\u01e0\u01d7\3\2\2\2\u01e0\u01db\3\2\2\2\u01e1p\3\2"+
+		"\u01e3\7g\2\2\u01dd\u01de\7h\2\2\u01de\u01df\7c\2\2\u01df\u01e0\7n\2\2"+
-		"\2\2\u01e2\u01e3\5\u010d\u0087\2\u01e3\u01e7\7\60\2\2\u01e4\u01e6\t\3"+
+		"\u01e0\u01e1\7u\2\2\u01e1\u01e3\7g\2\2\u01e2\u01d9\3\2\2\2\u01e2\u01dd"+
-		"\2\2\u01e5\u01e4\3\2\2\2\u01e6\u01e9\3\2\2\2\u01e7\u01e5\3\2\2\2\u01e7"+
+		"\3\2\2\2\u01e3p\3\2\2\2\u01e4\u01e5\5\u010f\u0088\2\u01e5\u01e9\7\60\2"+
-		"\u01e8\3\2\2\2\u01e8\u01eb\3\2\2\2\u01e9\u01e7\3\2\2\2\u01ea\u01ec\5\u010f"+
+		"\2\u01e6\u01e8\t\3\2\2\u01e7\u01e6\3\2\2\2\u01e8\u01eb\3\2\2\2\u01e9\u01e7"+
-		"\u0088\2\u01eb\u01ea\3\2\2\2\u01eb\u01ec\3\2\2\2\u01ec\u01fb\3\2\2\2\u01ed"+
+		"\3\2\2\2\u01e9\u01ea\3\2\2\2\u01ea\u01ed\3\2\2\2\u01eb\u01e9\3\2\2\2\u01ec"+
-		"\u01ef\7\60\2\2\u01ee\u01f0\t\3\2\2\u01ef\u01ee\3\2\2\2\u01f0\u01f1\3"+
+		"\u01ee\5\u0111\u0089\2\u01ed\u01ec\3\2\2\2\u01ed\u01ee\3\2\2\2\u01ee\u01fd"+
-		"\2\2\2\u01f1\u01ef\3\2\2\2\u01f1\u01f2\3\2\2\2\u01f2\u01f4\3\2\2\2\u01f3"+
+		"\3\2\2\2\u01ef\u01f1\7\60\2\2\u01f0\u01f2\t\3\2\2\u01f1\u01f0\3\2\2\2"+
-		"\u01f5\5\u010f\u0088\2\u01f4\u01f3\3\2\2\2\u01f4\u01f5\3\2\2\2\u01f5\u01fb"+
+		"\u01f2\u01f3\3\2\2\2\u01f3\u01f1\3\2\2\2\u01f3\u01f4\3\2\2\2\u01f4\u01f6"+
-		"\3\2\2\2\u01f6\u01f8\5\u010d\u0087\2\u01f7\u01f9\5\u010f\u0088\2\u01f8"+
+		"\3\2\2\2\u01f5\u01f7\5\u0111\u0089\2\u01f6\u01f5\3\2\2\2\u01f6\u01f7\3"+
-		"\u01f7\3\2\2\2\u01f8\u01f9\3\2\2\2\u01f9\u01fb\3\2\2\2\u01fa\u01e2\3\2"+
+		"\2\2\2\u01f7\u01fd\3\2\2\2\u01f8\u01fa\5\u010f\u0088\2\u01f9\u01fb\5\u0111"+
-		"\2\2\u01fa\u01ed\3\2\2\2\u01fa\u01f6\3\2\2\2\u01fbr\3\2\2\2\u01fc\u01fd"+
+		"\u0089\2\u01fa\u01f9\3\2\2\2\u01fa\u01fb\3\2\2\2\u01fb\u01fd\3\2\2\2\u01fc"+
-		"\7\62\2\2\u01fd\u01ff\t\4\2\2\u01fe\u0200\5\u010b\u0086\2\u01ff\u01fe"+
+		"\u01e4\3\2\2\2\u01fc\u01ef\3\2\2\2\u01fc\u01f8\3\2\2\2\u01fdr\3\2\2\2"+
-		"\3\2\2\2\u0200\u0201\3\2\2\2\u0201\u01ff\3\2\2\2\u0201\u0202\3\2\2\2\u0202"+
+		"\u01fe\u01ff\7\62\2\2\u01ff\u0201\t\4\2\2\u0200\u0202\5\u010d\u0087\2"+
-		"t\3\2\2\2\u0203\u0205\7\62\2\2\u0204\u0206\t\5\2\2\u0205\u0204\3\2\2\2"+
+		"\u0201\u0200\3\2\2\2\u0202\u0203\3\2\2\2\u0203\u0201\3\2\2\2\u0203\u0204"+
-		"\u0206\u0207\3\2\2\2\u0207\u0205\3\2\2\2\u0207\u0208\3\2\2\2\u0208\u0209"+
+		"\3\2\2\2\u0204t\3\2\2\2\u0205\u0207\7\62\2\2\u0206\u0208\t\5\2\2\u0207"+
-		"\3\2\2\2\u0209\u020a\6;\3\2\u020av\3\2\2\2\u020b\u020c\7\62\2\2\u020c"+
+		"\u0206\3\2\2\2\u0208\u0209\3\2\2\2\u0209\u0207\3\2\2\2\u0209\u020a\3\2"+
-		"\u020e\t\6\2\2\u020d\u020f\t\5\2\2\u020e\u020d\3\2\2\2\u020f\u0210\3\2"+
+		"\2\2\u020a\u020b\3\2\2\2\u020b\u020c\6;\3\2\u020cv\3\2\2\2\u020d\u020e"+
-		"\2\2\u0210\u020e\3\2\2\2\u0210\u0211\3\2\2\2\u0211x\3\2\2\2\u0212\u0213"+
+		"\7\62\2\2\u020e\u0210\t\6\2\2\u020f\u0211\t\5\2\2\u0210\u020f\3\2\2\2"+
-		"\7\62\2\2\u0213\u0215\t\7\2\2\u0214\u0216\t\b\2\2\u0215\u0214\3\2\2\2"+
+		"\u0211\u0212\3\2\2\2\u0212\u0210\3\2\2\2\u0212\u0213\3\2\2\2\u0213x\3"+
-		"\u0216\u0217\3\2\2\2\u0217\u0215\3\2\2\2\u0217\u0218\3\2\2\2\u0218z\3"+
+		"\2\2\2\u0214\u0215\7\62\2\2\u0215\u0217\t\7\2\2\u0216\u0218\t\b\2\2\u0217"+
-		"\2\2\2\u0219\u021a\7d\2\2\u021a\u021b\7t\2\2\u021b\u021c\7g\2\2\u021c"+
+		"\u0216\3\2\2\2\u0218\u0219\3\2\2\2\u0219\u0217\3\2\2\2\u0219\u021a\3\2"+
-		"\u021d\7c\2\2\u021d\u021e\7m\2\2\u021e|\3\2\2\2\u021f\u0220\7f\2\2\u0220"+
+		"\2\2\u021az\3\2\2\2\u021b\u021c\7d\2\2\u021c\u021d\7t\2\2\u021d\u021e"+
-		"\u0221\7q\2\2\u0221~\3\2\2\2\u0222\u0223\7k\2\2\u0223\u0224\7p\2\2\u0224"+
+		"\7g\2\2\u021e\u021f\7c\2\2\u021f\u0220\7m\2\2\u0220|\3\2\2\2\u0221\u0222"+
-		"\u0225\7u\2\2\u0225\u0226\7v\2\2\u0226\u0227\7c\2\2\u0227\u0228\7p\2\2"+
+		"\7f\2\2\u0222\u0223\7q\2\2\u0223~\3\2\2\2\u0224\u0225\7k\2\2\u0225\u0226"+
-		"\u0228\u0229\7e\2\2\u0229\u022a\7g\2\2\u022a\u022b\7q\2\2\u022b\u022c"+
+		"\7p\2\2\u0226\u0227\7u\2\2\u0227\u0228\7v\2\2\u0228\u0229\7c\2\2\u0229"+
-		"\7h\2\2\u022c\u0080\3\2\2\2\u022d\u022e\7v\2\2\u022e\u022f\7{\2\2\u022f"+
+		"\u022a\7p\2\2\u022a\u022b\7e\2\2\u022b\u022c\7g\2\2\u022c\u022d\7q\2\2"+
-		"\u0230\7r\2\2\u0230\u0231\7g\2\2\u0231\u0232\7q\2\2\u0232\u0233\7h\2\2"+
+		"\u022d\u022e\7h\2\2\u022e\u0080\3\2\2\2\u022f\u0230\7v\2\2\u0230\u0231"+
-		"\u0233\u0082\3\2\2\2\u0234\u0235\7e\2\2\u0235\u0236\7c\2\2\u0236\u0237"+
+		"\7{\2\2\u0231\u0232\7r\2\2\u0232\u0233\7g\2\2\u0233\u0234\7q\2\2\u0234"+
-		"\7u\2\2\u0237\u0238\7g\2\2\u0238\u0084\3\2\2\2\u0239\u023a\7g\2\2\u023a"+
+		"\u0235\7h\2\2\u0235\u0082\3\2\2\2\u0236\u0237\7e\2\2\u0237\u0238\7c\2"+
-		"\u023b\7n\2\2\u023b\u023c\7u\2\2\u023c\u023d\7g\2\2\u023d\u0086\3\2\2"+
+		"\2\u0238\u0239\7u\2\2\u0239\u023a\7g\2\2\u023a\u0084\3\2\2\2\u023b\u023c"+
-		"\2\u023e\u023f\7p\2\2\u023f\u0240\7g\2\2\u0240\u0241\7y\2\2\u0241\u0088"+
+		"\7g\2\2\u023c\u023d\7n\2\2\u023d\u023e\7u\2\2\u023e\u023f\7g\2\2\u023f"+
-		"\3\2\2\2\u0242\u0243\7x\2\2\u0243\u0244\7c\2\2\u0244\u0245\7t\2\2\u0245"+
+		"\u0086\3\2\2\2\u0240\u0241\7p\2\2\u0241\u0242\7g\2\2\u0242\u0243\7y\2"+
-		"\u008a\3\2\2\2\u0246\u0247\7e\2\2\u0247\u0248\7c\2\2\u0248\u0249\7v\2"+
+		"\2\u0243\u0088\3\2\2\2\u0244\u0245\7x\2\2\u0245\u0246\7c\2\2\u0246\u0247"+
-		"\2\u0249\u024a\7e\2\2\u024a\u024b\7j\2\2\u024b\u008c\3\2\2\2\u024c\u024d"+
+		"\7t\2\2\u0247\u008a\3\2\2\2\u0248\u0249\7e\2\2\u0249\u024a\7c\2\2\u024a"+
-		"\7h\2\2\u024d\u024e\7k\2\2\u024e\u024f\7p\2\2\u024f\u0250\7c\2\2\u0250"+
+		"\u024b\7v\2\2\u024b\u024c\7e\2\2\u024c\u024d\7j\2\2\u024d\u008c\3\2\2"+
-		"\u0251\7n\2\2\u0251\u0252\7n\2\2\u0252\u0253\7{\2\2\u0253\u008e\3\2\2"+
+		"\2\u024e\u024f\7h\2\2\u024f\u0250\7k\2\2\u0250\u0251\7p\2\2\u0251\u0252"+
-		"\2\u0254\u0255\7t\2\2\u0255\u0256\7g\2\2\u0256\u0257\7v\2\2\u0257\u0258"+
+		"\7c\2\2\u0252\u0253\7n\2\2\u0253\u0254\7n\2\2\u0254\u0255\7{\2\2\u0255"+
-		"\7w\2\2\u0258\u0259\7t\2\2\u0259\u025a\7p\2\2\u025a\u0090\3\2\2\2\u025b"+
+		"\u008e\3\2\2\2\u0256\u0257\7t\2\2\u0257\u0258\7g\2\2\u0258\u0259\7v\2"+
-		"\u025c\7x\2\2\u025c\u025d\7q\2\2\u025d\u025e\7k\2\2\u025e\u025f\7f\2\2"+
+		"\2\u0259\u025a\7w\2\2\u025a\u025b\7t\2\2\u025b\u025c\7p\2\2\u025c\u0090"+
-		"\u025f\u0092\3\2\2\2\u0260\u0261\7e\2\2\u0261\u0262\7q\2\2\u0262\u0263"+
+		"\3\2\2\2\u025d\u025e\7x\2\2\u025e\u025f\7q\2\2\u025f\u0260\7k\2\2\u0260"+
-		"\7p\2\2\u0263\u0264\7v\2\2\u0264\u0265\7k\2\2\u0265\u0266\7p\2\2\u0266"+
+		"\u0261\7f\2\2\u0261\u0092\3\2\2\2\u0262\u0263\7e\2\2\u0263\u0264\7q\2"+
-		"\u0267\7w\2\2\u0267\u0268\7g\2\2\u0268\u0094\3\2\2\2\u0269\u026a\7h\2"+
+		"\2\u0264\u0265\7p\2\2\u0265\u0266\7v\2\2\u0266\u0267\7k\2\2\u0267\u0268"+
-		"\2\u026a\u026b\7q\2\2\u026b\u026c\7t\2\2\u026c\u0096\3\2\2\2\u026d\u026e"+
+		"\7p\2\2\u0268\u0269\7w\2\2\u0269\u026a\7g\2\2\u026a\u0094\3\2\2\2\u026b"+
-		"\7u\2\2\u026e\u026f\7y\2\2\u026f\u0270\7k\2\2\u0270\u0271\7v\2\2\u0271"+
+		"\u026c\7h\2\2\u026c\u026d\7q\2\2\u026d\u026e\7t\2\2\u026e\u0096\3\2\2"+
-		"\u0272\7e\2\2\u0272\u0273\7j\2\2\u0273\u0098\3\2\2\2\u0274\u0275\7y\2"+
+		"\2\u026f\u0270\7u\2\2\u0270\u0271\7y\2\2\u0271\u0272\7k\2\2\u0272\u0273"+
-		"\2\u0275\u0276\7j\2\2\u0276\u0277\7k\2\2\u0277\u0278\7n\2\2\u0278\u0279"+
+		"\7v\2\2\u0273\u0274\7e\2\2\u0274\u0275\7j\2\2\u0275\u0098\3\2\2\2\u0276"+
-		"\7g\2\2\u0279\u009a\3\2\2\2\u027a\u027b\7f\2\2\u027b\u027c\7g\2\2\u027c"+
+		"\u0277\7y\2\2\u0277\u0278\7j\2\2\u0278\u0279\7k\2\2\u0279\u027a\7n\2\2"+
-		"\u027d\7d\2\2\u027d\u027e\7w\2\2\u027e\u027f\7i\2\2\u027f\u0280\7i\2\2"+
+		"\u027a\u027b\7g\2\2\u027b\u009a\3\2\2\2\u027c\u027d\7f\2\2\u027d\u027e"+
-		"\u0280\u0281\7g\2\2\u0281\u0282\7t\2\2\u0282\u009c\3\2\2\2\u0283\u0284"+
+		"\7g\2\2\u027e\u027f\7d\2\2\u027f\u0280\7w\2\2\u0280\u0281\7i\2\2\u0281"+
-		"\7h\2\2\u0284\u0285\7w\2\2\u0285\u0286\7p\2\2\u0286\u0287\7e\2\2\u0287"+
+		"\u0282\7i\2\2\u0282\u0283\7g\2\2\u0283\u0284\7t\2\2\u0284\u009c\3\2\2"+
-		"\u0288\7v\2\2\u0288\u0289\7k\2\2\u0289\u028a\7q\2\2\u028a\u028b\7p\2\2"+
+		"\2\u0285\u0286\7h\2\2\u0286\u0287\7w\2\2\u0287\u0288\7p\2\2\u0288\u0289"+
-		"\u028b\u009e\3\2\2\2\u028c\u028d\7v\2\2\u028d\u028e\7j\2\2\u028e\u028f"+
+		"\7e\2\2\u0289\u028a\7v\2\2\u028a\u028b\7k\2\2\u028b\u028c\7q\2\2\u028c"+
-		"\7k\2\2\u028f\u0290\7u\2\2\u0290\u00a0\3\2\2\2\u0291\u0292\7y\2\2\u0292"+
+		"\u028d\7p\2\2\u028d\u009e\3\2\2\2\u028e\u028f\7v\2\2\u028f\u0290\7j\2"+
-		"\u0293\7k\2\2\u0293\u0294\7v\2\2\u0294\u0295\7j\2\2\u0295\u00a2\3\2\2"+
+		"\2\u0290\u0291\7k\2\2\u0291\u0292\7u\2\2\u0292\u00a0\3\2\2\2\u0293\u0294"+
-		"\2\u0296\u0297\7f\2\2\u0297\u0298\7g\2\2\u0298\u0299\7h\2\2\u0299\u029a"+
+		"\7y\2\2\u0294\u0295\7k\2\2\u0295\u0296\7v\2\2\u0296\u0297\7j\2\2\u0297"+
-		"\7c\2\2\u029a\u029b\7w\2\2\u029b\u029c\7n\2\2\u029c\u029d\7v\2\2\u029d"+
+		"\u00a2\3\2\2\2\u0298\u0299\7f\2\2\u0299\u029a\7g\2\2\u029a\u029b\7h\2"+
-		"\u00a4\3\2\2\2\u029e\u029f\7k\2\2\u029f\u02a0\7h\2\2\u02a0\u00a6\3\2\2"+
+		"\2\u029b\u029c\7c\2\2\u029c\u029d\7w\2\2\u029d\u029e\7n\2\2\u029e\u029f"+
-		"\2\u02a1\u02a2\7v\2\2\u02a2\u02a3\7j\2\2\u02a3\u02a4\7t\2\2\u02a4\u02a5"+
+		"\7v\2\2\u029f\u00a4\3\2\2\2\u02a0\u02a1\7k\2\2\u02a1\u02a2\7h\2\2\u02a2"+
-		"\7q\2\2\u02a5\u02a6\7y\2\2\u02a6\u00a8\3\2\2\2\u02a7\u02a8\7f\2\2\u02a8"+
+		"\u00a6\3\2\2\2\u02a3\u02a4\7v\2\2\u02a4\u02a5\7j\2\2\u02a5\u02a6\7t\2"+
-		"\u02a9\7g\2\2\u02a9\u02aa\7n\2\2\u02aa\u02ab\7g\2\2\u02ab\u02ac\7v\2\2"+
+		"\2\u02a6\u02a7\7q\2\2\u02a7\u02a8\7y\2\2\u02a8\u00a8\3\2\2\2\u02a9\u02aa"+
-		"\u02ac\u02ad\7g\2\2\u02ad\u00aa\3\2\2\2\u02ae\u02af\7k\2\2\u02af\u02b0"+
+		"\7f\2\2\u02aa\u02ab\7g\2\2\u02ab\u02ac\7n\2\2\u02ac\u02ad\7g\2\2\u02ad"+
-		"\7p\2\2\u02b0\u00ac\3\2\2\2\u02b1\u02b2\7v\2\2\u02b2\u02b3\7t\2\2\u02b3"+
+		"\u02ae\7v\2\2\u02ae\u02af\7g\2\2\u02af\u00aa\3\2\2\2\u02b0\u02b1\7k\2"+
-		"\u02b4\7{\2\2\u02b4\u00ae\3\2\2\2\u02b5\u02b6\7g\2\2\u02b6\u02b7\7x\2"+
+		"\2\u02b1\u02b2\7p\2\2\u02b2\u00ac\3\2\2\2\u02b3\u02b4\7v\2\2\u02b4\u02b5"+
-		"\2\u02b7\u02b8\7g\2\2\u02b8\u02b9\7p\2\2\u02b9\u02ba\7v\2\2\u02ba\u00b0"+
+		"\7t\2\2\u02b5\u02b6\7{\2\2\u02b6\u00ae\3\2\2\2\u02b7\u02b8\7g\2\2\u02b8"+
-		"\3\2\2\2\u02bb\u02bc\7B\2\2\u02bc\u00b2\3\2\2\2\u02bd\u02be\7C\2\2\u02be"+
+		"\u02b9\7x\2\2\u02b9\u02ba\7g\2\2\u02ba\u02bb\7p\2\2\u02bb\u02bc\7v\2\2"+
-		"\u02bf\7V\2\2\u02bf\u02c0\7a\2\2\u02c0\u02c1\7N\2\2\u02c1\u02c2\7G\2\2"+
+		"\u02bc\u00b0\3\2\2\2\u02bd\u02be\7B\2\2\u02be\u00b2\3\2\2\2\u02bf\u02c0"+
-		"\u02c2\u02c3\7C\2\2\u02c3\u02c4\7U\2\2\u02c4\u02c5\7V\2\2\u02c5\u02c6"+
+		"\7C\2\2\u02c0\u02c1\7V\2\2\u02c1\u02c2\7a\2\2\u02c2\u02c3\7N\2\2\u02c3"+
-		"\7a\2\2\u02c6\u02c7\7Q\2\2\u02c7\u02c8\7P\2\2\u02c8\u02c9\7E\2\2\u02c9"+
+		"\u02c4\7G\2\2\u02c4\u02c5\7C\2\2\u02c5\u02c6\7U\2\2\u02c6\u02c7\7V\2\2"+
-		"\u02ca\7G\2\2\u02ca\u00b4\3\2\2\2\u02cb\u02cc\7C\2\2\u02cc\u02cd\7V\2"+
+		"\u02c7\u02c8\7a\2\2\u02c8\u02c9\7Q\2\2\u02c9\u02ca\7P\2\2\u02ca\u02cb"+
-		"\2\u02cd\u02ce\7a\2\2\u02ce\u02cf\7O\2\2\u02cf\u02d0\7Q\2\2\u02d0\u02d1"+
+		"\7E\2\2\u02cb\u02cc\7G\2\2\u02cc\u00b4\3\2\2\2\u02cd\u02ce\7C\2\2\u02ce"+
-		"\7U\2\2\u02d1\u02d2\7V\2\2\u02d2\u02d3\7a\2\2\u02d3\u02d4\7Q\2\2\u02d4"+
+		"\u02cf\7V\2\2\u02cf\u02d0\7a\2\2\u02d0\u02d1\7O\2\2\u02d1\u02d2\7Q\2\2"+
-		"\u02d5\7P\2\2\u02d5\u02d6\7E\2\2\u02d6\u02d7\7G\2\2\u02d7\u00b6\3\2\2"+
+		"\u02d2\u02d3\7U\2\2\u02d3\u02d4\7V\2\2\u02d4\u02d5\7a\2\2\u02d5\u02d6"+
-		"\2\u02d8\u02d9\7Q\2\2\u02d9\u02da\7P\2\2\u02da\u02db\7N\2\2\u02db\u02dc"+
+		"\7Q\2\2\u02d6\u02d7\7P\2\2\u02d7\u02d8\7E\2\2\u02d8\u02d9\7G\2\2\u02d9"+
-		"\7[\2\2\u02dc\u02dd\7a\2\2\u02dd\u02de\7Q\2\2\u02de\u02df\7P\2\2\u02df"+
+		"\u00b6\3\2\2\2\u02da\u02db\7Q\2\2\u02db\u02dc\7P\2\2\u02dc\u02dd\7N\2"+
-		"\u02e0\7E\2\2\u02e0\u02e1\7G\2\2\u02e1\u00b8\3\2\2\2\u02e2\u02e3\7i\2"+
+		"\2\u02dd\u02de\7[\2\2\u02de\u02df\7a\2\2\u02df\u02e0\7Q\2\2\u02e0\u02e1"+
-		"\2\u02e3\u02e4\7n\2\2\u02e4\u02e5\7q\2\2\u02e5\u02e6\7d\2\2\u02e6\u02e7"+
+		"\7P\2\2\u02e1\u02e2\7E\2\2\u02e2\u02e3\7G\2\2\u02e3\u00b8\3\2\2\2\u02e4"+
-		"\7c\2\2\u02e7\u02e8\7n\2\2\u02e8\u00ba\3\2\2\2\u02e9\u02ea\7n\2\2\u02ea"+
+		"\u02e5\7i\2\2\u02e5\u02e6\7n\2\2\u02e6\u02e7\7q\2\2\u02e7\u02e8\7d\2\2"+
-		"\u02eb\7q\2\2\u02eb\u02ec\7e\2\2\u02ec\u02ed\7c\2\2\u02ed\u02ee\7n\2\2"+
+		"\u02e8\u02e9\7c\2\2\u02e9\u02ea\7n\2\2\u02ea\u00ba\3\2\2\2\u02eb\u02ec"+
-		"\u02ee\u00bc\3\2\2\2\u02ef\u02f0\7x\2\2\u02f0\u02f1\7k\2\2\u02f1\u02f2"+
+		"\7n\2\2\u02ec\u02ed\7q\2\2\u02ed\u02ee\7e\2\2\u02ee\u02ef\7c\2\2\u02ef"+
-		"\7g\2\2\u02f2\u02f3\7y\2\2\u02f3\u00be\3\2\2\2\u02f4\u02f5\7e\2\2\u02f5"+
+		"\u02f0\7n\2\2\u02f0\u00bc\3\2\2\2\u02f1\u02f2\7x\2\2\u02f2\u02f3\7k\2"+
-		"\u02f6\7n\2\2\u02f6\u02f7\7c\2\2\u02f7\u02f8\7u\2\2\u02f8\u02f9\7u\2\2"+
+		"\2\u02f3\u02f4\7g\2\2\u02f4\u02f5\7y\2\2\u02f5\u00be\3\2\2\2\u02f6\u02f7"+
-		"\u02f9\u00c0\3\2\2\2\u02fa\u02fb\7g\2\2\u02fb\u02fc\7p\2\2\u02fc\u02fd"+
+		"\7e\2\2\u02f7\u02f8\7n\2\2\u02f8\u02f9\7c\2\2\u02f9\u02fa\7u\2\2\u02fa"+
-		"\7w\2\2\u02fd\u02fe\7o\2\2\u02fe\u00c2\3\2\2\2\u02ff\u0300\7g\2\2\u0300"+
+		"\u02fb\7u\2\2\u02fb\u00c0\3\2\2\2\u02fc\u02fd\7g\2\2\u02fd\u02fe\7p\2"+
-		"\u0301\7z\2\2\u0301\u0302\7v\2\2\u0302\u0303\7g\2\2\u0303\u0304\7p\2\2"+
+		"\2\u02fe\u02ff\7w\2\2\u02ff\u0300\7o\2\2\u0300\u00c2\3\2\2\2\u0301\u0302"+
-		"\u0304\u0305\7f\2\2\u0305\u0306\7u\2\2\u0306\u00c4\3\2\2\2\u0307\u0308"+
+		"\7g\2\2\u0302\u0303\7z\2\2\u0303\u0304\7v\2\2\u0304\u0305\7g\2\2\u0305"+
-		"\7u\2\2\u0308\u0309\7w\2\2\u0309\u030a\7r\2\2\u030a\u030b\7g\2\2\u030b"+
+		"\u0306\7p\2\2\u0306\u0307\7f\2\2\u0307\u0308\7u\2\2\u0308\u00c4\3\2\2"+
-		"\u030c\7t\2\2\u030c\u00c6\3\2\2\2\u030d\u030e\7e\2\2\u030e\u030f\7q\2"+
+		"\2\u0309\u030a\7u\2\2\u030a\u030b\7w\2\2\u030b\u030c\7r\2\2\u030c\u030d"+
-		"\2\u030f\u0310\7p\2\2\u0310\u0311\7u\2\2\u0311\u0312\7v\2\2\u0312\u00c8"+
+		"\7g\2\2\u030d\u030e\7t\2\2\u030e\u00c6\3\2\2\2\u030f\u0310\7e\2\2\u0310"+
-		"\3\2\2\2\u0313\u0314\7g\2\2\u0314\u0315\7z\2\2\u0315\u0316\7r\2\2\u0316"+
+		"\u0311\7q\2\2\u0311\u0312\7p\2\2\u0312\u0313\7u\2\2\u0313\u0314\7v\2\2"+
-		"\u0317\7q\2\2\u0317\u0318\7t\2\2\u0318\u0319\7v\2\2\u0319\u00ca\3\2\2"+
+		"\u0314\u00c8\3\2\2\2\u0315\u0316\7g\2\2\u0316\u0317\7z\2\2\u0317\u0318"+
-		"\2\u031a\u031b\7k\2\2\u031b\u031c\7o\2\2\u031c\u031d\7r\2\2\u031d\u031e"+
+		"\7r\2\2\u0318\u0319\7q\2\2\u0319\u031a\7t\2\2\u031a\u031b\7v\2\2\u031b"+
-		"\7q\2\2\u031e\u031f\7t\2\2\u031f\u0320\7v\2\2\u0320\u00cc\3\2\2\2\u0321"+
+		"\u00ca\3\2\2\2\u031c\u031d\7k\2\2\u031d\u031e\7o\2\2\u031e\u031f\7r\2"+
-		"\u0322\7e\2\2\u0322\u0323\7q\2\2\u0323\u0324\7p\2\2\u0324\u0325\7v\2\2"+
+		"\2\u031f\u0320\7q\2\2\u0320\u0321\7t\2\2\u0321\u0322\7v\2\2\u0322\u00cc"+
-		"\u0325\u0326\7t\2\2\u0326\u0327\7c\2\2\u0327\u0328\7e\2\2\u0328\u0329"+
+		"\3\2\2\2\u0323\u0324\7e\2\2\u0324\u0325\7q\2\2\u0325\u0326\7p\2\2\u0326"+
-		"\7v\2\2\u0329\u00ce\3\2\2\2\u032a\u032b\7o\2\2\u032b\u032c\7q\2\2\u032c"+
+		"\u0327\7v\2\2\u0327\u0328\7t\2\2\u0328\u0329\7c\2\2\u0329\u032a\7e\2\2"+
-		"\u032d\7f\2\2\u032d\u032e\7w\2\2\u032e\u032f\7n\2\2\u032f\u0330\7g\2\2"+
+		"\u032a\u032b\7v\2\2\u032b\u00ce\3\2\2\2\u032c\u032d\7o\2\2\u032d\u032e"+
-		"\u0330\u00d0\3\2\2\2\u0331\u0332\7q\2\2\u0332\u0333\7t\2\2\u0333\u0334"+
+		"\7q\2\2\u032e\u032f\7f\2\2\u032f\u0330\7w\2\2\u0330\u0331\7n\2\2\u0331"+
-		"\7c\2\2\u0334\u0335\7e\2\2\u0335\u0336\7n\2\2\u0336\u0337\7g\2\2\u0337"+
+		"\u0332\7g\2\2\u0332\u00d0\3\2\2\2\u0333\u0334\7q\2\2\u0334\u0335\7t\2"+
-		"\u00d2\3\2\2\2\u0338\u0339\7k\2\2\u0339\u033a\7o\2\2\u033a\u033b\7r\2"+
+		"\2\u0335\u0336\7c\2\2\u0336\u0337\7e\2\2\u0337\u0338\7n\2\2\u0338\u0339"+
-		"\2\u033b\u033c\7n\2\2\u033c\u033d\7g\2\2\u033d\u033e\7o\2\2\u033e\u033f"+
+		"\7g\2\2\u0339\u00d2\3\2\2\2\u033a\u033b\7f\2\2\u033b\u033c\7q\2\2\u033c"+
-		"\7g\2\2\u033f\u0340\7p\2\2\u0340\u0341\7v\2\2\u0341\u0342\7u\2\2\u0342"+
+		"\u033d\7k\2\2\u033d\u033e\7r\2\2\u033e\u033f\7o\2\2\u033f\u0340\7q\2\2"+
-		"\u0343\3\2\2\2\u0343\u0344\6j\4\2\u0344\u00d4\3\2\2\2\u0345\u0346\7n\2"+
+		"\u0340\u0341\7f\2\2\u0341\u0342\7w\2\2\u0342\u0343\7n\2\2\u0343\u0344"+
-		"\2\u0346\u0347\7g\2\2\u0347\u0348\7v\2\2\u0348\u0349\3\2\2\2\u0349\u034a"+
+		"\7g\2\2\u0344\u00d4\3\2\2\2\u0345\u0346\7k\2\2\u0346\u0347\7o\2\2\u0347"+
-		"\6k\5\2\u034a\u00d6\3\2\2\2\u034b\u034c\7r\2\2\u034c\u034d\7t\2\2\u034d"+
+		"\u0348\7r\2\2\u0348\u0349\7n\2\2\u0349\u034a\7g\2\2\u034a\u034b\7o\2\2"+
-		"\u034e\7k\2\2\u034e\u034f\7x\2\2\u034f\u0350\7c\2\2\u0350\u0351\7v\2\2"+
+		"\u034b\u034c\7g\2\2\u034c\u034d\7p\2\2\u034d\u034e\7v\2\2\u034e\u034f"+
-		"\u0351\u0352\7g\2\2\u0352\u0353\3\2\2\2\u0353\u0354\6l\6\2\u0354\u00d8"+
+		"\7u\2\2\u034f\u0350\3\2\2\2\u0350\u0351\6k\4\2\u0351\u00d6\3\2\2\2\u0352"+
-		"\3\2\2\2\u0355\u0356\7r\2\2\u0356\u0357\7w\2\2\u0357\u0358\7d\2\2\u0358"+
+		"\u0353\7n\2\2\u0353\u0354\7g\2\2\u0354\u0355\7v\2\2\u0355\u0356\3\2\2"+
-		"\u0359\7n\2\2\u0359\u035a\7k\2\2\u035a\u035b\7e\2\2\u035b\u035c\3\2\2"+
+		"\2\u0356\u0357\6l\5\2\u0357\u00d8\3\2\2\2\u0358\u0359\7r\2\2\u0359\u035a"+
-		"\2\u035c\u035d\6m\7\2\u035d\u00da\3\2\2\2\u035e\u035f\7k\2\2\u035f\u0360"+
+		"\7t\2\2\u035a\u035b\7k\2\2\u035b\u035c\7x\2\2\u035c\u035d\7c\2\2\u035d"+
-		"\7p\2\2\u0360\u0361\7v\2\2\u0361\u0362\7g\2\2\u0362\u0363\7t\2\2\u0363"+
+		"\u035e\7v\2\2\u035e\u035f\7g\2\2\u035f\u0360\3\2\2\2\u0360\u0361\6m\6"+
-		"\u0364\7h\2\2\u0364\u0365\7c\2\2\u0365\u0366\7e\2\2\u0366\u0367\7g\2\2"+
+		"\2\u0361\u00da\3\2\2\2\u0362\u0363\7r\2\2\u0363\u0364\7w\2\2\u0364\u0365"+
-		"\u0367\u0368\3\2\2\2\u0368\u0369\6n\b\2\u0369\u00dc\3\2\2\2\u036a\u036b"+
+		"\7d\2\2\u0365\u0366\7n\2\2\u0366\u0367\7k\2\2\u0367\u0368\7e\2\2\u0368"+
-		"\7r\2\2\u036b\u036c\7c\2\2\u036c\u036d\7e\2\2\u036d\u036e\7m\2\2\u036e"+
+		"\u0369\3\2\2\2\u0369\u036a\6n\7\2\u036a\u00dc\3\2\2\2\u036b\u036c\7k\2"+
-		"\u036f\7c\2\2\u036f\u0370\7i\2\2\u0370\u0371\7g\2\2\u0371\u0372\3\2\2"+
+		"\2\u036c\u036d\7p\2\2\u036d\u036e\7v\2\2\u036e\u036f\7g\2\2\u036f\u0370"+
-		"\2\u0372\u0373\6o\t\2\u0373\u00de\3\2\2\2\u0374\u0375\7r\2\2\u0375\u0376"+
+		"\7t\2\2\u0370\u0371\7h\2\2\u0371\u0372\7c\2\2\u0372\u0373\7e\2\2\u0373"+
-		"\7t\2\2\u0376\u0377\7q\2\2\u0377\u0378\7v\2\2\u0378\u0379\7g\2\2\u0379"+
+		"\u0374\7g\2\2\u0374\u0375\3\2\2\2\u0375\u0376\6o\b\2\u0376\u00de\3\2\2"+
-		"\u037a\7e\2\2\u037a\u037b\7v\2\2\u037b\u037c\7g\2\2\u037c\u037d\7f\2\2"+
+		"\2\u0377\u0378\7r\2\2\u0378\u0379\7c\2\2\u0379\u037a\7e\2\2\u037a\u037b"+
-		"\u037d\u037e\3\2\2\2\u037e\u037f\6p\n\2\u037f\u00e0\3\2\2\2\u0380\u0381"+
+		"\7m\2\2\u037b\u037c\7c\2\2\u037c\u037d\7i\2\2\u037d\u037e\7g\2\2\u037e"+
-		"\7u\2\2\u0381\u0382\7v\2\2\u0382\u0383\7c\2\2\u0383\u0384\7v\2\2\u0384"+
+		"\u037f\3\2\2\2\u037f\u0380\6p\t\2\u0380\u00e0\3\2\2\2\u0381\u0382\7r\2"+
-		"\u0385\7k\2\2\u0385\u0386\7e\2\2\u0386\u0387\3\2\2\2\u0387\u0388\6q\13"+
+		"\2\u0382\u0383\7t\2\2\u0383\u0384\7q\2\2\u0384\u0385\7v\2\2\u0385\u0386"+
-		"\2\u0388\u00e2\3\2\2\2\u0389\u038a\7{\2\2\u038a\u038b\7k\2\2\u038b\u038c"+
+		"\7g\2\2\u0386\u0387\7e\2\2\u0387\u0388\7v\2\2\u0388\u0389\7g\2\2\u0389"+
-		"\7g\2\2\u038c\u038d\7n\2\2\u038d\u038e\7f\2\2\u038e\u038f\3\2\2\2\u038f"+
+		"\u038a\7f\2\2\u038a\u038b\3\2\2\2\u038b\u038c\6q\n\2\u038c\u00e2\3\2\2"+
-		"\u0390\6r\f\2\u0390\u00e4\3\2\2\2\u0391\u0395\5\u0113\u008a\2\u0392\u0394"+
+		"\2\u038d\u038e\7u\2\2\u038e\u038f\7v\2\2\u038f\u0390\7c\2\2\u0390\u0391"+
-		"\5\u0111\u0089\2\u0393\u0392\3\2\2\2\u0394\u0397\3\2\2\2\u0395\u0393\3"+
+		"\7v\2\2\u0391\u0392\7k\2\2\u0392\u0393\7e\2\2\u0393\u0394\3\2\2\2\u0394"+
-		"\2\2\2\u0395\u0396\3\2\2\2\u0396\u00e6\3\2\2\2\u0397\u0395\3\2\2\2\u0398"+
+		"\u0395\6r\13\2\u0395\u00e4\3\2\2\2\u0396\u0397\7{\2\2\u0397\u0398\7k\2"+
-		"\u039c\7$\2\2\u0399\u039b\5\u00f5{\2\u039a\u0399\3\2\2\2\u039b\u039e\3"+
+		"\2\u0398\u0399\7g\2\2\u0399\u039a\7n\2\2\u039a\u039b\7f\2\2\u039b\u039c"+
-		"\2\2\2\u039c\u039a\3\2\2\2\u039c\u039d\3\2\2\2\u039d\u039f\3\2\2\2\u039e"+
+		"\3\2\2\2\u039c\u039d\6s\f\2\u039d\u00e6\3\2\2\2\u039e\u03a2\5\u0115\u008b"+
-		"\u039c\3\2\2\2\u039f\u03a9\7$\2\2\u03a0\u03a4\7)\2\2\u03a1\u03a3\5\u00f7"+
+		"\2\u039f\u03a1\5\u0113\u008a\2\u03a0\u039f\3\2\2\2\u03a1\u03a4\3\2\2\2"+
-		"|\2\u03a2\u03a1\3\2\2\2\u03a3\u03a6\3\2\2\2\u03a4\u03a2\3\2\2\2\u03a4"+
+		"\u03a2\u03a0\3\2\2\2\u03a2\u03a3\3\2\2\2\u03a3\u00e8\3\2\2\2\u03a4\u03a2"+
-		"\u03a5\3\2\2\2\u03a5\u03a7\3\2\2\2\u03a6\u03a4\3\2\2\2\u03a7\u03a9\7)"+
+		"\3\2\2\2\u03a5\u03a9\7$\2\2\u03a6\u03a8\5\u00f7|\2\u03a7\u03a6\3\2\2\2"+
-		"\2\2\u03a8\u0398\3\2\2\2\u03a8\u03a0\3\2\2\2\u03a9\u03aa\3\2\2\2\u03aa"+
+		"\u03a8\u03ab\3\2\2\2\u03a9\u03a7\3\2\2\2\u03a9\u03aa\3\2\2\2\u03aa\u03ac"+
-		"\u03ab\bt\5\2\u03ab\u00e8\3\2\2\2\u03ac\u03b2\7b\2\2\u03ad\u03ae\7^\2"+
+		"\3\2\2\2\u03ab\u03a9\3\2\2\2\u03ac\u03b6\7$\2\2\u03ad\u03b1\7)\2\2\u03ae"+
-		"\2\u03ae\u03b1\7b\2\2\u03af\u03b1\n\t\2\2\u03b0\u03ad\3\2\2\2\u03b0\u03af"+
+		"\u03b0\5\u00f9}\2\u03af\u03ae\3\2\2\2\u03b0\u03b3\3\2\2\2\u03b1\u03af"+
-		"\3\2\2\2\u03b1\u03b4\3\2\2\2\u03b2\u03b0\3\2\2\2\u03b2\u03b3\3\2\2\2\u03b3"+
+		"\3\2\2\2\u03b1\u03b2\3\2\2\2\u03b2\u03b4\3\2\2\2\u03b3\u03b1\3\2\2\2\u03b4"+
-		"\u03b5\3\2\2\2\u03b4\u03b2\3\2\2\2\u03b5\u03b6\7b\2\2\u03b6\u00ea\3\2"+
+		"\u03b6\7)\2\2\u03b5\u03a5\3\2\2\2\u03b5\u03ad\3\2\2\2\u03b6\u03b7\3\2"+
-		"\2\2\u03b7\u03b9\t\n\2\2\u03b8\u03b7\3\2\2\2\u03b9\u03ba\3\2\2\2\u03ba"+
+		"\2\2\u03b7\u03b8\bu\5\2\u03b8\u00ea\3\2\2\2\u03b9\u03bf\7b\2\2\u03ba\u03bb"+
-		"\u03b8\3\2\2\2\u03ba\u03bb\3\2\2\2\u03bb\u03bc\3\2\2\2\u03bc\u03bd\bv"+
+		"\7^\2\2\u03bb\u03be\7b\2\2\u03bc\u03be\n\t\2\2\u03bd\u03ba\3\2\2\2\u03bd"+
-		"\2\2\u03bd\u00ec\3\2\2\2\u03be\u03bf\t\2\2\2\u03bf\u03c0\3\2\2\2\u03c0"+
+		"\u03bc\3\2\2\2\u03be\u03c1\3\2\2\2\u03bf\u03bd\3\2\2\2\u03bf\u03c0\3\2"+
-		"\u03c1\bw\2\2\u03c1\u00ee\3\2\2\2\u03c2\u03c3\7>\2\2\u03c3\u03c4\7#\2"+
+		"\2\2\u03c0\u03c2\3\2\2\2\u03c1\u03bf\3\2\2\2\u03c2\u03c3\7b\2\2\u03c3"+
-		"\2\u03c4\u03c5\7/\2\2\u03c5\u03c6\7/\2\2\u03c6\u03ca\3\2\2\2\u03c7\u03c9"+
+		"\u00ec\3\2\2\2\u03c4\u03c6\t\n\2\2\u03c5\u03c4\3\2\2\2\u03c6\u03c7\3\2"+
-		"\13\2\2\2\u03c8\u03c7\3\2\2\2\u03c9\u03cc\3\2\2\2\u03ca\u03cb\3\2\2\2"+
+		"\2\2\u03c7\u03c5\3\2\2\2\u03c7\u03c8\3\2\2\2\u03c8\u03c9\3\2\2\2\u03c9"+
-		"\u03ca\u03c8\3\2\2\2\u03cb\u03cd\3\2\2\2\u03cc\u03ca\3\2\2\2\u03cd\u03ce"+
+		"\u03ca\bw\2\2\u03ca\u00ee\3\2\2\2\u03cb\u03cc\t\2\2\2\u03cc\u03cd\3\2"+
-		"\7/\2\2\u03ce\u03cf\7/\2\2\u03cf\u03d0\7@\2\2\u03d0\u03d1\3\2\2\2\u03d1"+
+		"\2\2\u03cd\u03ce\bx\2\2\u03ce\u00f0\3\2\2\2\u03cf\u03d0\7>\2\2\u03d0\u03d1"+
-		"\u03d2\bx\2\2\u03d2\u00f0\3\2\2\2\u03d3\u03d4\7>\2\2\u03d4\u03d5\7#\2"+
+		"\7#\2\2\u03d1\u03d2\7/\2\2\u03d2\u03d3\7/\2\2\u03d3\u03d7\3\2\2\2\u03d4"+
-		"\2\u03d5\u03d6\7]\2\2\u03d6\u03d7\7E\2\2\u03d7\u03d8\7F\2\2\u03d8\u03d9"+
+		"\u03d6\13\2\2\2\u03d5\u03d4\3\2\2\2\u03d6\u03d9\3\2\2\2\u03d7\u03d8\3"+
-		"\7C\2\2\u03d9\u03da\7V\2\2\u03da\u03db\7C\2\2\u03db\u03dc\7]\2\2\u03dc"+
+		"\2\2\2\u03d7\u03d5\3\2\2\2\u03d8\u03da\3\2\2\2\u03d9\u03d7\3\2\2\2\u03da"+
-		"\u03e0\3\2\2\2\u03dd\u03df\13\2\2\2\u03de\u03dd\3\2\2\2\u03df\u03e2\3"+
+		"\u03db\7/\2\2\u03db\u03dc\7/\2\2\u03dc\u03dd\7@\2\2\u03dd\u03de\3\2\2"+
-		"\2\2\2\u03e0\u03e1\3\2\2\2\u03e0\u03de\3\2\2\2\u03e1\u03e3\3\2\2\2\u03e2"+
+		"\2\u03de\u03df\by\2\2\u03df\u00f2\3\2\2\2\u03e0\u03e1\7>\2\2\u03e1\u03e2"+
-		"\u03e0\3\2\2\2\u03e3\u03e4\7_\2\2\u03e4\u03e5\7_\2\2\u03e5\u03e6\7@\2"+
+		"\7#\2\2\u03e2\u03e3\7]\2\2\u03e3\u03e4\7E\2\2\u03e4\u03e5\7F\2\2\u03e5"+
-		"\2\u03e6\u03e7\3\2\2\2\u03e7\u03e8\by\2\2\u03e8\u00f2\3\2\2\2\u03e9\u03ea"+
+		"\u03e6\7C\2\2\u03e6\u03e7\7V\2\2\u03e7\u03e8\7C\2\2\u03e8\u03e9\7]\2\2"+
-		"\13\2\2\2\u03ea\u03eb\3\2\2\2\u03eb\u03ec\bz\6\2\u03ec\u00f4\3\2\2\2\u03ed"+
+		"\u03e9\u03ed\3\2\2\2\u03ea\u03ec\13\2\2\2\u03eb\u03ea\3\2\2\2\u03ec\u03ef"+
-		"\u03f2\n\13\2\2\u03ee\u03ef\7^\2\2\u03ef\u03f2\5\u00f9}\2\u03f0\u03f2"+
+		"\3\2\2\2\u03ed\u03ee\3\2\2\2\u03ed\u03eb\3\2\2\2\u03ee\u03f0\3\2\2\2\u03ef"+
-		"\5\u0109\u0085\2\u03f1\u03ed\3\2\2\2\u03f1\u03ee\3\2\2\2\u03f1\u03f0\3"+
+		"\u03ed\3\2\2\2\u03f0\u03f1\7_\2\2\u03f1\u03f2\7_\2\2\u03f2\u03f3\7@\2"+
-		"\2\2\2\u03f2\u00f6\3\2\2\2\u03f3\u03f8\n\f\2\2\u03f4\u03f5\7^\2\2\u03f5"+
+		"\2\u03f3\u03f4\3\2\2\2\u03f4\u03f5\bz\2\2\u03f5\u00f4\3\2\2\2\u03f6\u03f7"+
-		"\u03f8\5\u00f9}\2\u03f6\u03f8\5\u0109\u0085\2\u03f7\u03f3\3\2\2\2\u03f7"+
+		"\13\2\2\2\u03f7\u03f8\3\2\2\2\u03f8\u03f9\b{\6\2\u03f9\u00f6\3\2\2\2\u03fa"+
-		"\u03f4\3\2\2\2\u03f7\u03f6\3\2\2\2\u03f8\u00f8\3\2\2\2\u03f9\u03ff\5\u00fb"+
+		"\u03ff\n\13\2\2\u03fb\u03fc\7^\2\2\u03fc\u03ff\5\u00fb~\2\u03fd\u03ff"+
-		"~\2\u03fa\u03ff\7\62\2\2\u03fb\u03ff\5\u00fd\177\2\u03fc\u03ff\5\u00ff"+
+		"\5\u010b\u0086\2\u03fe\u03fa\3\2\2\2\u03fe\u03fb\3\2\2\2\u03fe\u03fd\3"+
-		"\u0080\2\u03fd\u03ff\5\u0101\u0081\2\u03fe\u03f9\3\2\2\2\u03fe\u03fa\3"+
+		"\2\2\2\u03ff\u00f8\3\2\2\2\u0400\u0405\n\f\2\2\u0401\u0402\7^\2\2\u0402"+
-		"\2\2\2\u03fe\u03fb\3\2\2\2\u03fe\u03fc\3\2\2\2\u03fe\u03fd\3\2\2\2\u03ff"+
+		"\u0405\5\u00fb~\2\u0403\u0405\5\u010b\u0086\2\u0404\u0400\3\2\2\2\u0404"+
-		"\u00fa\3\2\2\2\u0400\u0403\5\u0103\u0082\2\u0401\u0403\5\u0105\u0083\2"+
+		"\u0401\3\2\2\2\u0404\u0403\3\2\2\2\u0405\u00fa\3\2\2\2\u0406\u040c\5\u00fd"+
-		"\u0402\u0400\3\2\2\2\u0402\u0401\3\2\2\2\u0403\u00fc\3\2\2\2\u0404\u0405"+
+		"\177\2\u0407\u040c\7\62\2\2\u0408\u040c\5\u00ff\u0080\2\u0409\u040c\5"+
-		"\7z\2\2\u0405\u0406\5\u010b\u0086\2\u0406\u0407\5\u010b\u0086\2\u0407"+
+		"\u0101\u0081\2\u040a\u040c\5\u0103\u0082\2\u040b\u0406\3\2\2\2\u040b\u0407"+
-		"\u00fe\3\2\2\2\u0408\u0409\7w\2\2\u0409\u040a\5\u010b\u0086\2\u040a\u040b"+
+		"\3\2\2\2\u040b\u0408\3\2\2\2\u040b\u0409\3\2\2\2\u040b\u040a\3\2\2\2\u040c"+
-		"\5\u010b\u0086\2\u040b\u040c\5\u010b\u0086\2\u040c\u040d\5\u010b\u0086"+
+		"\u00fc\3\2\2\2\u040d\u0410\5\u0105\u0083\2\u040e\u0410\5\u0107\u0084\2"+
-		"\2\u040d\u0100\3\2\2\2\u040e\u040f\7w\2\2\u040f\u0411\7}\2\2\u0410\u0412"+
+		"\u040f\u040d\3\2\2\2\u040f\u040e\3\2\2\2\u0410\u00fe\3\2\2\2\u0411\u0412"+
-		"\5\u010b\u0086\2\u0411\u0410\3\2\2\2\u0412\u0413\3\2\2\2\u0413\u0411\3"+
+		"\7z\2\2\u0412\u0413\5\u010d\u0087\2\u0413\u0414\5\u010d\u0087\2\u0414"+
-		"\2\2\2\u0413\u0414\3\2\2\2\u0414\u0415\3\2\2\2\u0415\u0416\7\177\2\2\u0416"+
+		"\u0100\3\2\2\2\u0415\u0416\7w\2\2\u0416\u0417\5\u010d\u0087\2\u0417\u0418"+
-		"\u0102\3\2\2\2\u0417\u0418\t\r\2\2\u0418\u0104\3\2\2\2\u0419\u041a\n\16"+
+		"\5\u010d\u0087\2\u0418\u0419\5\u010d\u0087\2\u0419\u041a\5\u010d\u0087"+
-		"\2\2\u041a\u0106\3\2\2\2\u041b\u041e\5\u0103\u0082\2\u041c\u041e\t\17"+
+		"\2\u041a\u0102\3\2\2\2\u041b\u041c\7w\2\2\u041c\u041e\7}\2\2\u041d\u041f"+
-		"\2\2\u041d\u041b\3\2\2\2\u041d\u041c\3\2\2\2\u041e\u0108\3\2\2\2\u041f"+
+		"\5\u010d\u0087\2\u041e\u041d\3\2\2\2\u041f\u0420\3\2\2\2\u0420\u041e\3"+
-		"\u0420\7^\2\2\u0420\u0421\t\2\2\2\u0421\u010a\3\2\2\2\u0422\u0423\t\20"+
+		"\2\2\2\u0420\u0421\3\2\2\2\u0421\u0422\3\2\2\2\u0422\u0423\7\177\2\2\u0423"+
-		"\2\2\u0423\u010c\3\2\2\2\u0424\u042d\7\62\2\2\u0425\u0429\t\21\2\2\u0426"+
+		"\u0104\3\2\2\2\u0424\u0425\t\r\2\2\u0425\u0106\3\2\2\2\u0426\u0427\n\16"+
-		"\u0428\t\3\2\2\u0427\u0426\3\2\2\2\u0428\u042b\3\2\2\2\u0429\u0427\3\2"+
+		"\2\2\u0427\u0108\3\2\2\2\u0428\u042b\5\u0105\u0083\2\u0429\u042b\t\17"+
-		"\2\2\u0429\u042a\3\2\2\2\u042a\u042d\3\2\2\2\u042b\u0429\3\2\2\2\u042c"+
+		"\2\2\u042a\u0428\3\2\2\2\u042a\u0429\3\2\2\2\u042b\u010a\3\2\2\2\u042c"+
-		"\u0424\3\2\2\2\u042c\u0425\3\2\2\2\u042d\u010e\3\2\2\2\u042e\u0430\t\22"+
+		"\u042d\7^\2\2\u042d\u042e\t\2\2\2\u042e\u010c\3\2\2\2\u042f\u0430\t\20"+
-		"\2\2\u042f\u0431\t\23\2\2\u0430\u042f\3\2\2\2\u0430\u0431\3\2\2\2\u0431"+
+		"\2\2\u0430\u010e\3\2\2\2\u0431\u043a\7\62\2\2\u0432\u0436\t\21\2\2\u0433"+
-		"\u0433\3\2\2\2\u0432\u0434\t\3\2\2\u0433\u0432\3\2\2\2\u0434\u0435\3\2"+
+		"\u0435\t\3\2\2\u0434\u0433\3\2\2\2\u0435\u0438\3\2\2\2\u0436\u0434\3\2"+
-		"\2\2\u0435\u0433\3\2\2\2\u0435\u0436\3\2\2\2\u0436\u0110\3\2\2\2\u0437"+
+		"\2\2\u0436\u0437\3\2\2\2\u0437\u043a\3\2\2\2\u0438\u0436\3\2\2\2\u0439"+
-		"\u043d\5\u0113\u008a\2\u0438\u043d\5\u0117\u008c\2\u0439\u043d\5\u0119"+
+		"\u0431\3\2\2\2\u0439\u0432\3\2\2\2\u043a\u0110\3\2\2\2\u043b\u043d\t\22"+
-		"\u008d\2\u043a\u043d\5\u011b\u008e\2\u043b\u043d\4\u200e\u200f\2\u043c"+
+		"\2\2\u043c\u043e\t\23\2\2\u043d\u043c\3\2\2\2\u043d\u043e\3\2\2\2\u043e"+
-		"\u0437\3\2\2\2\u043c\u0438\3\2\2\2\u043c\u0439\3\2\2\2\u043c\u043a\3\2"+
+		"\u0440\3\2\2\2\u043f\u0441\t\3\2\2\u0440\u043f\3\2\2\2\u0441\u0442\3\2"+
-		"\2\2\u043c\u043b\3\2\2\2\u043d\u0112\3\2\2\2\u043e\u0443\5\u0115\u008b"+
+		"\2\2\u0442\u0440\3\2\2\2\u0442\u0443\3\2\2\2\u0443\u0112\3\2\2\2\u0444"+
-		"\2\u043f\u0443\t\24\2\2\u0440\u0441\7^\2\2\u0441\u0443\5\u00ff\u0080\2"+
+		"\u044a\5\u0115\u008b\2\u0445\u044a\5\u0119\u008d\2\u0446\u044a\5\u011b"+
-		"\u0442\u043e\3\2\2\2\u0442\u043f\3\2\2\2\u0442\u0440\3\2\2\2\u0443\u0114"+
+		"\u008e\2\u0447\u044a\5\u011d\u008f\2\u0448\u044a\4\u200e\u200f\2\u0449"+
-		"\3\2\2\2\u0444\u0446\t\25\2\2\u0445\u0444\3\2\2\2\u0446\u0116\3\2\2\2"+
+		"\u0444\3\2\2\2\u0449\u0445\3\2\2\2\u0449\u0446\3\2\2\2\u0449\u0447\3\2"+
-		"\u0447\u0449\t\26\2\2\u0448\u0447\3\2\2\2\u0449\u0118\3\2\2\2\u044a\u044c"+
+		"\2\2\u0449\u0448\3\2\2\2\u044a\u0114\3\2\2\2\u044b\u0450\5\u0117\u008c"+
-		"\t\27\2\2\u044b\u044a\3\2\2\2\u044c\u011a\3\2\2\2\u044d\u044f\t\30\2\2"+
+		"\2\u044c\u0450\t\24\2\2\u044d\u044e\7^\2\2\u044e\u0450\5\u0101\u0081\2"+
-		"\u044e\u044d\3\2\2\2\u044f\u011c\3\2\2\2\u0450\u045b\n\31\2\2\u0451\u045b"+
+		"\u044f\u044b\3\2\2\2\u044f\u044c\3\2\2\2\u044f\u044d\3\2\2\2\u0450\u0116"+
-		"\5\u0121\u0091\2\u0452\u0456\7]\2\2\u0453\u0455\5\u011f\u0090\2\u0454"+
+		"\3\2\2\2\u0451\u0453\t\25\2\2\u0452\u0451\3\2\2\2\u0453\u0118\3\2\2\2"+
-		"\u0453\3\2\2\2\u0455\u0458\3\2\2\2\u0456\u0454\3\2\2\2\u0456\u0457\3\2"+
+		"\u0454\u0456\t\26\2\2\u0455\u0454\3\2\2\2\u0456\u011a\3\2\2\2\u0457\u0459"+
-		"\2\2\u0457\u0459\3\2\2\2\u0458\u0456\3\2\2\2\u0459\u045b\7_\2\2\u045a"+
+		"\t\27\2\2\u0458\u0457\3\2\2\2\u0459\u011c\3\2\2\2\u045a\u045c\t\30\2\2"+
-		"\u0450\3\2\2\2\u045a\u0451\3\2\2\2\u045a\u0452\3\2\2\2\u045b\u011e\3\2"+
+		"\u045b\u045a\3\2\2\2\u045c\u011e\3\2\2\2\u045d\u0468\n\31\2\2\u045e\u0468"+
-		"\2\2\u045c\u045f\n\32\2\2\u045d\u045f\5\u0121\u0091\2\u045e\u045c\3\2"+
+		"\5\u0123\u0092\2\u045f\u0463\7]\2\2\u0460\u0462\5\u0121\u0091\2\u0461"+
-		"\2\2\u045e\u045d\3\2\2\2\u045f\u0120\3\2\2\2\u0460\u0461\7^\2\2\u0461"+
+		"\u0460\3\2\2\2\u0462\u0465\3\2\2\2\u0463\u0461\3\2\2\2\u0463\u0464\3\2"+
-		"\u0462\n\2\2\2\u0462\u0122\3\2\2\2.\2\u0129\u0137\u0140\u0147\u01e0\u01e7"+
+		"\2\2\u0464\u0466\3\2\2\2\u0465\u0463\3\2\2\2\u0466\u0468\7_\2\2\u0467"+
-		"\u01eb\u01f1\u01f4\u01f8\u01fa\u0201\u0207\u0210\u0217\u0395\u039c\u03a4"+
+		"\u045d\3\2\2\2\u0467\u045e\3\2\2\2\u0467\u045f\3\2\2\2\u0468\u0120\3\2"+
-		"\u03a8\u03b0\u03b2\u03ba\u03ca\u03e0\u03f1\u03f7\u03fe\u0402\u0413\u041d"+
+		"\2\2\u0469\u046c\n\32\2\2\u046a\u046c\5\u0123\u0092\2\u046b\u0469\3\2"+
-		"\u0429\u042c\u0430\u0435\u043c\u0442\u0445\u0448\u044b\u044e\u0456\u045a"+
+		"\2\2\u046b\u046a\3\2\2\2\u046c\u0122\3\2\2\2\u046d\u046e\7^\2\2\u046e"+
-		"\u045e\7\2\3\2\3\t\2\3\n\3\3t\4\2\4\2";
+		"\u046f\n\2\2\2\u046f\u0124\3\2\2\2.\2\u012b\u0139\u0142\u0149\u01e2\u01e9"+
+		"\u01ed\u01f3\u01f6\u01fa\u01fc\u0203\u0209\u0212\u0219\u03a2\u03a9\u03b1"+
+		"\u03b5\u03bd\u03bf\u03c7\u03d7\u03ed\u03fe\u0404\u040b\u040f\u0420\u042a"+
+		"\u0436\u0439\u043d\u0442\u0449\u044f\u0452\u0455\u0458\u045b\u0463\u0467"+
+		"\u046b\7\2\3\2\3\t\2\3\n\3\3u\4\2\4\2";
 	public static final ATN _ATN =
 		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {

src/main/gen/org/bdware/sc/parser/JavaScriptLexer.tokens

@@ -102,23 +102,24 @@ Import=101
 Contract=102
 Module=103
 Oracle=104
-Implements=105
+DoipModule=105
-Let=106
+Implements=106
-Private=107
+Let=107
-Public=108
+Private=108
-Interface=109
+Public=109
-Package=110
+Interface=110
-Protected=111
+Package=111
-Static=112
+Protected=112
-Yield=113
+Static=113
-Identifier=114
+Yield=114
-StringLiteral=115
+Identifier=115
-TemplateStringLiteral=116
+StringLiteral=116
-WhiteSpaces=117
+TemplateStringLiteral=117
-LineTerminator=118
+WhiteSpaces=118
-HtmlComment=119
+LineTerminator=119
-CDataComment=120
+HtmlComment=120
-UnexpectedCharacter=121
+CDataComment=121
+UnexpectedCharacter=122
 '['=4
 ']'=5
 '('=6
@@ -214,12 +215,13 @@ UnexpectedCharacter=121
 'contract'=102
 'module'=103
 'oracle'=104
-'implements'=105
+'doipmodule'=105
-'let'=106
+'implements'=106
-'private'=107
+'let'=107
-'public'=108
+'private'=108
-'interface'=109
+'public'=109
-'package'=110
+'interface'=110
-'protected'=111
+'package'=111
-'static'=112
+'protected'=112
-'yield'=113
+'static'=113
+'yield'=114

src/main/gen/org/bdware/sc/parser/YJSParser.tokens

@@ -102,23 +102,24 @@ Import=101
 Contract=102
 Module=103
 Oracle=104
-Implements=105
+DoipModule=105
-Let=106
+Implements=106
-Private=107
+Let=107
-Public=108
+Private=108
-Interface=109
+Public=109
-Package=110
+Interface=110
-Protected=111
+Package=111
-Static=112
+Protected=112
-Yield=113
+Static=113
-Identifier=114
+Yield=114
-StringLiteral=115
+Identifier=115
-TemplateStringLiteral=116
+StringLiteral=116
-WhiteSpaces=117
+TemplateStringLiteral=117
-LineTerminator=118
+WhiteSpaces=118
-HtmlComment=119
+LineTerminator=119
-CDataComment=120
+HtmlComment=120
-UnexpectedCharacter=121
+CDataComment=121
+UnexpectedCharacter=122
 '['=4
 ']'=5
 '('=6
@@ -214,12 +215,13 @@ UnexpectedCharacter=121
 'contract'=102
 'module'=103
 'oracle'=104
-'implements'=105
+'doipmodule'=105
-'let'=106
+'implements'=106
-'private'=107
+'let'=107
-'public'=108
+'private'=108
-'interface'=109
+'public'=109
-'package'=110
+'interface'=110
-'protected'=111
+'package'=111
-'static'=112
+'protected'=112
-'yield'=113
+'static'=113
+'yield'=114

src/main/gen/org/bdware/sc/parser/YJSParserBaseListener.java

@@ -1,4 +1,5 @@
-package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/bdcontract-bundle/genparser/input/YJSParser.g4 by ANTLR 4.9.2
+// Generated from YJSParser.g4 by ANTLR 4.9.2
+package org.bdware.sc.parser;
 
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.antlr.v4.runtime.tree.ErrorNode;

src/main/gen/org/bdware/sc/parser/YJSParserBaseVisitor.java

@@ -1,4 +1,5 @@
-package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/bdcontract-bundle/genparser/input/YJSParser.g4 by ANTLR 4.9.2
+// Generated from YJSParser.g4 by ANTLR 4.9.2
+package org.bdware.sc.parser;
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 
 /**

src/main/gen/org/bdware/sc/parser/YJSParserListener.java

@@ -1,4 +1,5 @@
-package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/bdcontract-bundle/genparser/input/YJSParser.g4 by ANTLR 4.9.2
+// Generated from YJSParser.g4 by ANTLR 4.9.2
+package org.bdware.sc.parser;
 import org.antlr.v4.runtime.tree.ParseTreeListener;
 
 /**

src/main/gen/org/bdware/sc/parser/YJSParserVisitor.java

@@ -1,4 +1,5 @@
-package org.bdware.sc.parser;// Generated from /Users/frankrwu/Workspace/JetBrains/Idea/bdcontract-bundle/genparser/input/YJSParser.g4 by ANTLR 4.9.2
+// Generated from YJSParser.g4 by ANTLR 4.9.2
+package org.bdware.sc.parser;
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
 
 /**

src/main/pythongen/org/bdware/sc/commParser/BDLedgerAdapter.txt

@@ -0,0 +1,15 @@
+package org.bdware.sc.commParser;
+
+public class BDLedgerAdapter {
+    public Transaction tx;
+    public org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction ledgerChain;
+
+    public BDLedgerAdapter(org.bdware.bdledger.api.grpc.pb.CommonProto.Transaction chaintrans) {
+        super();
+        this.ledgerChain = chaintrans;
+        this.tx = new Transaction();
+        this.tx.Data = chaintrans.getData().toStringUtf8().getBytes();
+        this.tx.SrcID = chaintrans.getFrom().toByteArray();  //本地库中SrcID可以是key
+        this.tx.Txid = chaintrans.getHash().toByteArray();
+    }
+}

src/main/pythongen/org/bdware/sc/contractGen/ContractGenerator.txt

@@ -0,0 +1,69 @@
+package org.bdware.sc.contractGen;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.bdware.sc.util.JsonUtil;
+
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContractGenerator {
+    static VelocityEngine ve = init();
+
+    public static String generateAPIContract(Map<String, String> arg) {
+        VelocityContext ctx = new VelocityContext();
+        Template script = ve.getTemplate("org/bdware/sc/sc/contractGen/timeindexcontract.vm");
+        ctx.put("indexData", arg.get("indexData"));
+        ctx.put("datalen", arg.get("datalen"));
+        ctx.put("sdkpath", arg.get("sdkpath"));
+        ctx.put("syncbyheight", arg.get("syncbyheight"));
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    public static String generateIndexContract(long availableDate, String url, String method, Map<String, String> header,
+                                               Map<String, String> arg) {
+        VelocityContext ctx = new VelocityContext();
+
+        Template script = ve.getTemplate("com/yancloud/sc/indexcontract.vm");
+        String onblock = "var hash = com.yancloud.sc.util.HashUtil.str16ToBytes(args);\n print(hash)";
+        ctx.put("onBlock", onblock);
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static VelocityEngine init() {
+        VelocityEngine ve = new VelocityEngine();
+        ve.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
+        ve.setProperty("classpath.resource.loader.class", ClasspathResourceLoader.class.getName());
+        ve.init();
+        return ve;
+    }
+
+    public static String generateFTPContract(long availableDate) {
+        VelocityContext ctx = new VelocityContext();
+        Template script = ve.getTemplate("org/bdware/sc/sc/ftpcontract.vm");
+        String[][] initList = {{"availableDate", availableDate + ""}};
+        ctx.put("initList", initList);
+        ctx.put("validate", "YancloudUtil.currentTimeMillis()>Global.availableDate");
+        StringWriter writer = new StringWriter();
+        script.merge(ctx, writer);
+        return writer.toString();
+    }
+
+    private static String stringify(String url) {
+        return JsonUtil.toJson(url);
+    }
+
+    private static String convertMap(Map<String, String> arg) {
+        if (null == arg)
+            arg = new HashMap<>();
+        return JsonUtil.toJson(arg);
+    }
+}

src/main/pythongen/org/bdware/sc/contractGen/ContractGeneratorUI.txt

@@ -0,0 +1,131 @@
+package org.bdware.sc.contractGen;
+
+import org.jb2011.lnf.beautyeye.BeautyEyeLNFHelper;
+
+import javax.swing.*;
+import javax.swing.plaf.FontUIResource;
+import java.awt.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ContractGeneratorUI {
+    public static void main(String[] args) {
+        try {
+            BeautyEyeLNFHelper.frameBorderStyle = BeautyEyeLNFHelper.FrameBorderStyle.osLookAndFeelDecorated;
+            org.jb2011.lnf.beautyeye.BeautyEyeLNFHelper.launchBeautyEyeLNF();
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        InitGlobalFont(new Font("alias", Font.PLAIN, 15));
+
+        JFrame frame = new JFrame("索引生成");//创建Frame窗口
+        JPanel checkbox_panel;
+        final JCheckBox checkBox_time;
+        final JCheckBox checkBox_account;
+        checkbox_panel = new JPanel();//面板索引选择
+        checkBox_time = new JCheckBox("时间索引");
+        checkBox_account = new JCheckBox("账户索引");
+
+        checkbox_panel.add(checkBox_time);
+        checkbox_panel.add(checkBox_account);
+
+        final JPanel input_sdk = new JPanel();//SDK包名;
+        final JLabel sdk_label = new JLabel("SDK类名");
+        final JTextField sdk = new JTextField(10);
+        final JLabel datalen_label = new JLabel("数据长度");
+        final JTextField data_length = new JTextField(10);
+        final JCheckBox height_sync_cbox = new JCheckBox("使用高度同步");
+        input_sdk.add(sdk_label);
+        input_sdk.add(sdk);
+        input_sdk.add(datalen_label);
+        input_sdk.add(data_length);
+        input_sdk.add(height_sync_cbox);
+
+        final JTabbedPane tab = new JTabbedPane();//选项卡
+        final JPanel cards = new JPanel();    //卡片式布局的面板
+        cards.add(input_sdk);
+        cards.add(checkbox_panel);
+        cards.add(tab);
+        frame.add(cards);
+        frame.setBounds(100, 200, 800, 800);
+        frame.setVisible(true);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        final Map<String, MainFrame> framemap = new HashMap<>();
+        checkBox_time.addActionListener(e -> {
+            System.out.println("performed");
+            if (checkBox_time.isSelected()) {
+                if (sdk.getText().length() != 0 && data_length.getText().length() != 0) {
+                    Map<String, String> map = new HashMap<>();
+                    map.put("indexData", "./RocksDB");
+                    map.put("datalen", data_length.getText());
+                    map.put("sdkpath", sdk.getText());
+                    if (height_sync_cbox.isSelected()) {
+                        map.put("syncbyheight", "true");
+                    }
+                    String res = ContractGenerator.generateAPIContract(map);
+                    MainFrame time_panel = new MainFrame();
+                    framemap.put("time", time_panel);
+                    time_panel.textfield.setText(res);
+                    tab.add(time_panel, "时间索引");
+                    try {
+                        File file = new File("./output/timeindex.yjs");
+                        file.createNewFile();
+                        FileWriter writer = new FileWriter(file);
+                        BufferedWriter out = new BufferedWriter(writer);
+                        out.write(res);
+                        out.close();
+                    } catch (IOException e1) {
+                        // TODO Auto-generated catch block
+                        e1.printStackTrace();
+                    }
+                }
+            } else {
+                tab.remove(framemap.get("time"));
+            }
+        });
+        checkBox_account.addActionListener(e -> {
+            if (checkBox_account.isSelected()) {
+                Map<String, String> map = new HashMap<>();
+                map.put("indexData", "./RocksDB");
+                String res = ContractGenerator.generateAPIContract(map);
+                MainFrame account_panel = new MainFrame();
+                framemap.put("account", account_panel);
+                account_panel.textfield.setText(res);
+                tab.add(account_panel, "账户索引");
+                try {
+                    File file = new File("./output/accountindex.yjs");
+                    file.createNewFile();
+                    FileWriter writer = new FileWriter(file);
+                    BufferedWriter out = new BufferedWriter(writer);
+                    out.write(res);
+                    out.close();
+                } catch (IOException e1) {
+                    // TODO Auto-generated catch block
+                    e1.printStackTrace();
+                }
+            } else {
+                tab.remove(framemap.get("account"));
+            }
+        });
+    }
+
+    /**
+     * 统一设置字体，父界面设置之后，所有由父界面进入的子界面都不需要再次设置字体
+     */
+    private static void InitGlobalFont(Font font) {
+        FontUIResource fontRes = new FontUIResource(font);
+        for (Enumeration<Object> keys = UIManager.getDefaults().keys(); keys.hasMoreElements(); ) {
+            Object key = keys.nextElement();
+            Object value = UIManager.get(key);
+            if (value instanceof FontUIResource) {
+                UIManager.put(key, fontRes);
+            }
+        }
+    }
+}

src/main/pythongen/org/bdware/sc/contractGen/MainFrame.txt

@@ -0,0 +1,55 @@
+package org.bdware.sc.contractGen;
+
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
+
+import javax.swing.*;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MainFrame extends JPanel {
+    final RSyntaxTextArea textfield;
+    JLabel sdk_label;
+    JLabel datalen_label;
+
+    JPanel p1;
+    JPanel p2;
+    JButton generate;
+    JButton reset;
+
+    public MainFrame() {
+        this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+
+        p1 = new JPanel();//面板OnBlock
+        p2 = new JPanel();//面板OnBlock
+
+        generate = new JButton("生成合约");
+        reset = new JButton("重置内容");
+        p2.add(generate);
+        p2.add(reset);
+
+        this.textfield = new RSyntaxTextArea(30, 80);//height,width
+        textfield.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT);
+        textfield.setCodeFoldingEnabled(true);
+
+        JScrollPane scroll = new JScrollPane(textfield);
+        scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
+
+        p1.add(scroll);
+        this.add(p1);
+        this.add(p2);
+
+        reset.addActionListener(arg0 -> {
+            // TODO Auto-generated method stub
+            textfield.setText("");
+        });
+        generate.addActionListener(e -> {
+            // TODO Auto-generated method stub
+            // use new file to generate yjs
+            Map<String, String> map = new HashMap<>();
+            map.put("indexData", "./RocksDB");
+            String res = ContractGenerator.generateAPIContract(map);
+        });
+    }
+}

src/main/resources/log4j2.properties

@@ -0,0 +1,15 @@
+filter.threshold.type=ThresholdFilter
+filter.threshold.level=debug
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%highlight{[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n}{FATAL=Bright Red,ERROR=Red,WARN=Yellow,INFO=Green,DEBUG=Blue,TRACE=White}
+appender.rolling.type=File
+appender.rolling.name=log
+appender.rolling.append=true
+appender.rolling.fileName=./log/cm.log
+appender.rolling.layout.type=PatternLayout
+appender.rolling.layout.pattern=%d-%m%n
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=STDOUT
+rootLogger.appenderRef.log.ref=log

src/test/java/org/bdware/MultiIndextTimeRocksDBUtilTest.java

@@ -0,0 +1,51 @@
+package org.bdware;
+
+import com.google.gson.JsonObject;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.db.MultiIndexTimeRocksDBUtil;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+public class MultiIndextTimeRocksDBUtilTest {
+    static Logger LOGGER = LogManager.getLogger(MultiIndextTimeRocksDBUtilTest.class);
+    MultiIndexTimeRocksDBUtil util;
+
+    @Before
+    public void init() {
+        util = new MultiIndexTimeRocksDBUtil("testoutput/timeIndexDB", "defaultTable");
+    }
+
+    @Test
+    public void put() {
+        for (int i = 0; i < 100; i++) {
+            try {
+                Thread.sleep(10);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            util.put("abc_123", "ddd " + System.currentTimeMillis());
+        }
+    }
+
+    @Test
+    public void listAll() {
+        List<JsonObject> tt = util.queryByOffset(null, 0, 100);
+        for (int i = 0; i < tt.size(); i++) {
+            long val = tt.get(i).get("timestamp").getAsLong();
+            LOGGER.info(String.format("pre %d cu %d suc %d", util.queryOffset("abc_123", val - 1L),
+                    util.queryOffset("abc_123", val), util.queryOffset("abc_123", val + 1L), util.queryOffset("abc_123", val - 1L)));
+        }
+
+    }
+
+    @Test
+    public void run() {
+        LOGGER.info(util.queryOffset("abc_123", 1641454140657L));
+        LOGGER.info(util.queryOffset("abc_123", 1641454140669L));
+        LOGGER.info(util.queryOffset("abc_123", 1641450028482L));
+        LOGGER.info(util.queryOffset("abc_123", 1641450028483L));
+    }
+}

src/test/java/org/bdware/sc/LedgerUtilTest.java

@@ -1,21 +1,17 @@
 package org.bdware.sc;
 
-import org.bdware.bdledger.api.grpc.Client;
-//import org.bdware.bdledger.api.grpc.pb.QueryOuterClass;
-import org.bdware.bdledger.api.grpc.pb.QueryProto;
 import org.junit.Test;
 
 public class LedgerUtilTest {
 
     @Test
     public void query(){
-        String str = "0828c62576606e27ef8d079dea60cadd6eb03351";
+//        String str = "0828c62576606e27ef8d079dea60cadd6eb03351";
-        Client c = new Client("022.node.internetapi.cn",21121);
+//        Client c = new Client("022.node.internetapi.cn",21121);
-        QueryProto.GetTransactionByHashResponse syncResult = c.getTransactionByHashSync("default", "5c79fb8d71771615a5c8173b8089cd4841c3adfb");
+//        QueryProto.GetTransactionByHashResponse syncResult = c.getTransactionByHashSync("default", "5c79fb8d71771615a5c8173b8089cd4841c3adfb");
-        System.out.println(new String(syncResult.getTransaction().getData().toByteArray()));
+//        System.out.println(new String(syncResult.getTransaction().getData().toByteArray()));
-        System.out.println(syncResult.getTransaction().getData().toByteArray().length);
+//        System.out.println(syncResult.getTransaction().getData().toByteArray().length);
-
+       // 092：47.107.94.135
-        // 092：47.107.94.135
        // 093：120.79.215.187
 //        QueryOuterClass.GetTransactionByHashResponse hash = c.getTransactionByHashSync("test", str);
 //        String str2 =  hash.getTransaction().getFrom().toStringUtf8();

src/test/java/org/bdware/sc/boundary/utils/SM2UtilTest.java

@@ -1,5 +1,6 @@
 package org.bdware.sc.boundary.utils;
 
+import org.bdware.sc.bean.ContractRequest;
 import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
@@ -10,7 +11,6 @@ import org.junit.Test;
 import org.zz.gmhelper.BCECUtil;
 import org.zz.gmhelper.SM2KeyPair;
 import org.zz.gmhelper.SM2Util;
-import sun.misc.BASE64Encoder;
 
 import java.math.BigInteger;
 import java.security.KeyPair;
@@ -20,13 +20,38 @@ public class SM2UtilTest {
             "{\"publicKey\":\"0442e39c0b1623e6f95ef896d37f41aa3cd98fbc3aea71250eedba4335c6c3aff51b5fa2352f920d1063b50a30738427c18375df886985a63e0f496293fdad22a8\",\"privateKey\":\"b7e504cf951792554bf4a9874be37cb1279d38939444388e2046ee9603b4f0c4\"}";
     SM2KeyPair keyPair = SM2KeyPair.fromJson(keyPairStr);
 
+    @Test
+    public void loadKey() throws Exception {
+        String keyStr = "{\"privateKey\": \"b4ab74a0d8691fc45fd214bdaf45b1dc6ac288a93d1518599fc824ab29310a1a\",\n" +
+                "  \"publicKey\": \"04fef570617a3a2dfba6a4dd25050919266735f683f69aee8df4cd600f34b7440a26e90af3b92b63bad7c013f32c2665599ddde33c87736efa667eb027cdd8572f\"\n" +
+                " }";
+        SM2KeyPair keyPair = SM2KeyPair.fromJson(keyStr);
+        byte[] result = SM2Util.sign(keyPair.getPrivateKeyParameter(), "abc".getBytes());
+        System.out.println(result.length);
+    }
+
+    @Test
+    public void verify2() {
+        String toVerify = "GeneralContract|plainTextTransmission|{\"ledger\":\"test\",\"data\":\"上链信息为json格式\"}|04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15";
+        String sign = "30440220137771d7505abde700c89cfa376f67c564dfdec6ffdb08cb08ff70544be6cb6f0220587296439bedf43f4b0bfec2d7030a8250d369e53af623e50a734e3b6cb780cb";
+        String pubkey = "04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15";
+        ContractRequest cr = new ContractRequest();
+        cr.setContractID("GeneralContract");
+        cr.setAction("plainTextTransmission");
+        cr.setArg("{\"ledger\":\"test\",\"data\":\"上链信息为json格式\"}");
+        cr.setPublicKey("04398dfde44290595cd098cd2f904b36367c69f9011719d43fb0955f823cf1386764769bc7c0a5649dcb316d552998a5c106afd268d9db8b6482ce527544a7bd15");
+        cr.setSignature("30440220137771d7505abde700c89cfa376f67c564dfdec6ffdb08cb08ff70544be6cb6f0220587296439bedf43f4b0bfec2d7030a8250d369e53af623e50a734e3b6cb780cb");
+
+        System.out.println(cr.verifySignature());
+    }
+
     @Test
     public void base64() {
         String gstr =
                 "09146332716e7767327923056946406e49570e5909146332716e7767327923056946406e49570e59";
         byte[] bytes = ByteUtils.fromHexString(gstr);
-        String str = new BASE64Encoder().encode(bytes);
+        // String str = new BASE64Encoder().encode(bytes);
-        System.out.println(str);
+        //   System.out.println(str);
     }
 
     @Test
@@ -115,6 +140,24 @@ public class SM2UtilTest {
 
     }
 
+    @Test
+    public void dosignTest() throws Exception {
+        String tosign = "action=startContract&script=contract%20shortc%7B%0A%09export%20function%20main(arg)%7B%0A%09%09return%20arg.length%3B%09%0A%09%7D%0A%7D&pubKey=041a3875bb1a8d6acfc1142c60e3cc7c11831d4878c6dbbf9bb0929716d6cf402492b9629a4ced9198ae2c419f8d3d6ae810a431458d38901e5597636b715584d4";
+        // keyPair = SM2KeyPair.fromJson("{\"privateKey\":\"94728f3d95f19b3b5b11a31fdb603b5b2e8b377d9520d0680ac4f270cc82ec51\",\"publicKey\":\"041a3875bb1a8d6acfc1142c60e3cc7c11831d4878c6dbbf9bb0929716d6cf402492b9629a4ced9198ae2c419f8d3d6ae810a431458d38901e5597636b715584d4\"}");
+        keyPair = SM2KeyPair.fromJson("{\"privateKey\":\"589d94ee5688358a1c5c18430dd9c75097ddddebf769f139da36a807911d20f8\",\"publicKey\":\"04d1924329f72ced148f6f333fb985ccbaa31b1e3aacf10be5f43d4a4ff5ad88899a005e79e37fc06993e1d66ada8cf8b711cb36f59538bb7d3e39e70fa9360ddd\"}");
+        String signature = ByteUtils.toHexString(
+                SM2Util.sign(
+                        keyPair.getPrivateKeyParameter(), tosign.getBytes()));
+        System.out.println(signature);
+        ECPublicKeyParameters pubKey =
+                BCECUtil.createECPublicKeyFromStrParameters(
+                        keyPair.getPublicKeyStr(), SM2Util.CURVE, SM2Util.DOMAIN_PARAMS);
+        boolean verify = SM2Util.verify(
+                pubKey, tosign.getBytes(), ByteUtils.fromHexString(signature));
+        System.out.println(verify);
+
+
+    }
     // Deprecated
     //    @Test
     //    public void signAtServer() {