Fixed bug of Reader

syumai · Dec 29, 2018 · 30db9ef · 30db9ef
1 parent e747510
commit 30db9ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+tsconfig.json
diff --git a/dpl.ts b/dpl.ts
@@ -41,11 +41,10 @@ async function renderInternal(body: Reader, params: Params): Promise<Reader> {
   return {
     async read(p: Uint8Array): Promise<ReadResult> {
       const len = p.byteLength;
-      let eof: boolean;
       let nread: number;
 
       for (nread = 0; nread < len; nread++) {
-        ({ eof } = await src.read(readBuf));
+        const { eof } = await src.read(readBuf);
         if (eof) {
           break;
         }
@@ -75,14 +74,15 @@ async function renderInternal(body: Reader, params: Params): Promise<Reader> {
             continue;
           }
           if (buf.length > 2) {
-            p[nread] = buf.shift();
+            p[nread - 2] = buf.shift();
           }
           continue;
         }
 
         // Finish current ReadMode
         if (buf[1] === Codes.Percent && buf[2] === Codes.End) {
           statement.push(buf.shift());
+          nread--;
           buf.splice(0);
           // Don't execute if ReadMode is Comment.
           if (readMode !== ReadMode.Comment) {
@@ -100,18 +100,20 @@ async function renderInternal(body: Reader, params: Params): Promise<Reader> {
           }
           statement.splice(0);
           readMode = ReadMode.Normal;
-          nread -= 2;
+          nread -= 3;
           continue;
         }
         statement.push(buf.shift());
+        nread--;
       }
 
       // Flush buffer
       while (nread < len && buf.length > 0) {
-        p[nread] = buf.shift();
+        p[nread - 2] = buf.shift();
+        console.log(nread);
         nread++;
       }
-      return { nread, eof };
+      return { nread, eof: nread === 0 };
     },
   };
 }