Merge branch 'cleanup' of LInE/ivprog into master

.ima_version.json

@@ -1 +1 @@
-{ "version":"2019_03_01 12_50" }
+{ "version":"2019_03_01 13_44" }

grammar/index.js

@@ -8,6 +8,8 @@ import * as ES from './es/ivprog.g4';
 import ESFuncs from './es/langFunctions';
 import ESLibs from './es/langLibs';
 
-exports.pt = {lexer: PT.ivprog, langFuncs: PTFuncs, langLibs: PTLibs};
-exports.en = {lexer: EN.ivprog, langFuncs: ENFuncs, langLibs: ENLibs};
-exports.es = {lexer: ES.ivprog, langFuncs: ESFuncs, langLibs: ESLibs};
+export default {
+  pt: {lexer: PT.ivprog, langFuncs: PTFuncs, langLibs: PTLibs},
+  en: {lexer: EN.ivprog, langFuncs: ENFuncs, langLibs: ENLibs},
+  es: {lexer: ES.ivprog, langFuncs: ESFuncs, langLibs: ESLibs}
+}

js/typeSystem/parsers.js

@@ -37,7 +37,7 @@ export function toBool (str) {
   }
 }
 
-function convertBoolToString (bool) {
+export function convertBoolToString (bool) {
   const lexer = LanguageService.getCurrentLexer();
   const instance = new lexer(null);
   if (bool) {

package.json

@@ -4,10 +4,9 @@
   "description": "IMA para o ensino de programação",
   "main": "js/main.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "babel": "babel --presets env js/main.js -o build/ivprog.bunlde.js",
     "start": "http-server",
-    "webpack": "webpack"
+    "build": "webpack",
+    "watch": "webpack --watch"
   },
   "repository": {
     "type": "git",
@@ -25,24 +24,14 @@
   },
   "homepage": "https://github.com/git.lcalion.com/ivprog#readme",
   "devDependencies": {
+    "@babel/core": "^7.3.4",
+    "@babel/preset-env": "^7.3.4",
     "antlr4-webpack-loader": "^0.1.1",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.5",
-    "babel-preset-env": "^1.7.0",
-    "jasmine-core": "^3.2.1",
-    "karma": "^3.0.0",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage-istanbul-reporter": "^2.0.1",
-    "karma-firefox-launcher": "^1.1.0",
-    "karma-jasmine": "^1.1.2",
-    "karma-jasmine-html-reporter": "^1.3.1",
-    "karma-mocha-reporter": "^2.2.5",
-    "karma-webpack": "^3.0.5",
-    "puppeteer-core": "^1.7.0",
+    "babel-loader": "^8.0.5",
     "ts-loader": "^5.2.2",
     "typescript": "^3.1.3",
-    "webpack": "^4.*",
-    "webpack-cli": "^3.1.0"
+    "webpack": "^4.29.0",
+    "webpack-cli": "^3.2.1"
   },
   "dependencies": {
     "antlr4": "^4.7.1",

webpack.config.js

@@ -5,7 +5,6 @@ var UpdateVersionPlugin = require('./updateVersionPlugin');
 module.exports = {
     entry: './js/main.js',
     mode: 'development',
-    watch: true,
     output: {
         path: path.resolve(__dirname, 'build'),
         filename: 'ivprog.bundle.js',
@@ -16,16 +15,25 @@ module.exports = {
         fs: 'empty',
     },
     module: {
-        rules: [{
-            test: /\.js$/,
-            loader: 'babel-loader',
-            query: {
-                presets: ['env']
+        rules: [
+            {
+              test: /\.js$/,
+              exclude: /(node_modules)/,
+              use: {
+                loader: "babel-loader",
+                options: {
+                  presets: ["@babel/preset-env"]
+                }
+              }
+            },
+            {
+              test: /\.g4$/,
+              exclude: /(node_modules)/,
+              use: {
+                loader:'antlr4-webpack-loader'
+              }
             }
-        }, {
-            test: /\.g4/,
-            loader: 'antlr4-webpack-loader'
-        }]
+        ]
     },
     stats: {
         colors: true