Merge pull request #98 from bavix/comment

fix
bavix · Feb 26, 2024 · 5aa1864 · 5aa1864
2 parents c24c75d + deb0752
commit 5aa1864
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/public/index.js b/public/index.js
diff --git a/public/index.js.map b/public/index.js.map
diff --git a/src/input.jsx b/src/input.jsx
@@ -10,7 +10,7 @@ import { Notify } from 'notiflix/build/notiflix-notify-aio';
 const SIGNED = 2 ** 0
 const UNSIGNED = 2 ** 1
 
-const rg = /^["']|["']+$/g
+const rg = /["'“”]/g
 const nrg = /"(-?\d+)"/g
 
 export function intTypeList() {
@@ -109,13 +109,13 @@ export default class InputComponent extends React.Component {
     }
 
     parse = (line) => {
-        let results = line.split("//").map(s => s.trim())
+        let results = line.split("//").map(s => s.trim().replace(/,$/g, '').trimRight())
 
         if (results.length > 1) {
             return {input: results[0].toString(), comment: results[1].toString()}
         }
 
-        return {input: results[0].toString(), comment: ""}
+        return {input: results[0].toString(), comment: undefined}
     }
 
     normalize = (input) => {

diff --git a/src/object-parser.js b/src/object-parser.js
@@ -5,8 +5,6 @@ const hlrg = /^(-?\d+)[;:,](-?\d+)$/
 const trg = /["']?(-?\d+)["']?/g
 
 export function objectParse(val) {
-    val = val.replace(/[“”]/g, '') // adhoc
-
     if (val[0] === '[') {
         return JSON.parse(val.replace(trg, '$1'))
     }