Commit 3d34ac45 authored by Marcos Viera's avatar Marcos Viera
Browse files

bug de Error arreglado

parent 472a14f1
This diff is collapsed.
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
"zone.js": "^0.8.4" "zone.js": "^0.8.4"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.2.6", "@angular/cli": "^1.6.4",
"@angular/compiler-cli": "^4.0.0", "@angular/compiler-cli": "^4.0.0",
"@types/jasmine": "2.5.38", "@types/jasmine": "2.5.38",
"@types/jquery": "^2.0.45", "@types/jquery": "^2.0.45",
......
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
// export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint'; // export const GHCI_URL = 'ws://35.198.60.74:9090/endpoint';
// psico // psico
export const SERVER = 'https://matefun.math.psico.edu.uy'; // export const SERVER = 'https://matefun.math.psico.edu.uy';
export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint'; // export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint';
//diego docker //diego docker
// export const SERVER = 'http://localhost:8080'; export const SERVER = 'http://localhost:8080';
// export const GHCI_URL = 'ws://localhost:8080/endpoint'; export const GHCI_URL = 'ws://localhost:8080/endpoint';
\ No newline at end of file \ No newline at end of file
...@@ -154,7 +154,9 @@ export class GHCIService { ...@@ -154,7 +154,9 @@ export class GHCIService {
} }
}else { }else {
try{ try{
var line = Number(JSON.parse(text).resultado.split("en línea")[1].split(",")[0].trim())-1; var lineTxt = `${this.translateService.get('i18n.codemirror.command.inLine').value}`;
var line = Number(JSON.parse(text).resultado.split(lineTxt)[1].split(",")[0].trim())-1;
this.waitingForError = true; this.waitingForError = true;
this.lastError = line; this.lastError = line;
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
}, },
"codemirror" : { "codemirror" : {
"command" : { "command" : {
"inLine" : "en línea", "inLine" : "en linea",
"column" : "column", "column" : "column",
"inColumn" : "En columna", "inColumn" : "En columna",
"line" : "line", "line" : "line",
......
<!doctype html> <!doctype html><html><head><meta charset="utf-8"><title>Proyecto MateFun</title><base href="/"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" type="image/x-icon" href="favicon.ico"><!-- despues lo saco de aca --><!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> --><script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script><script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script><script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script><!--
<html>
<head>
<meta charset="utf-8">
<title>Proyecto MateFun</title>
<base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<!-- despues lo saco de aca -->
<!-- <link rel="stylesheet" type="text/css" href="node_modules/codemirror/addon/hint/show-hint.css"> -->
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js" crossorigin="anonymous"></script>
<!--
<script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script> <script src="https://wzrd.in/standalone/function-plot@1.18.1" crossorigin="anonymous"></script>
--> --><link href="styles.8e9b76ce39821b2f5328.bundle.css" rel="stylesheet"/></head><body><app-root><div class="loading"><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div><div class="loading-bar"></div></div></app-root><script type="text/javascript" src="inline.5c62427195e11ca1e3fb.bundle.js"></script><script type="text/javascript" src="polyfills.d50ac7c762e2eb4097d9.bundle.js"></script><script type="text/javascript" src="scripts.d01654a9119059a68b2b.bundle.js"></script><script type="text/javascript" src="vendor.d3c1758890cc7548bc7b.bundle.js"></script><script type="text/javascript" src="main.94941e96a5bd65bdeb71.bundle.js"></script></body></html>
</head> \ No newline at end of file
<body>
<app-root>
<div class="loading">
<div class="loading-bar"></div>
<div class="loading-bar"></div>
<div class="loading-bar"></div>
<div class="loading-bar"></div>
<div class="loading-bar"></div>
</div>
</app-root>
<script type="text/javascript" src="inline.bundle.js"></script><script type="text/javascript" src="polyfills.bundle.js"></script><script type="text/javascript" src="scripts.bundle.js"></script><script type="text/javascript" src="styles.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="main.bundle.js"></script></body>
</html>
# Translation file
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-13 06:05-0800\n" "POT-Creation-Date: 2009-01-13 06:05-0800\n"
"PO-Revision-Date: 2009-01-13 06:05-0800\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
"Language: en\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
# MateFun messages.pot file
#: src/MateFun/ReservedNames.hs:20 #: src/MateFun/ReservedNames.hs:20
msgid "3D Figure" msgid "3D Figure"
msgstr "3D Figure" msgstr "3D Figure"
#: src/MateFun.hs:346 #: src/MateFun.hs:359
msgid "3D Figures" msgid "3D Figures"
msgstr "3D Figures" msgstr "3D Figures"
...@@ -60,7 +61,7 @@ msgstr "Blue" ...@@ -60,7 +61,7 @@ msgstr "Blue"
msgid "Brain exploded!" msgid "Brain exploded!"
msgstr "Brain exploded!" msgstr "Brain exploded!"
#: src/MateFun.hs:126 src/MateFun.hs:142 #: src/MateFun.hs:128 src/MateFun.hs:145
msgid "Bye!!" msgid "Bye!!"
msgstr "Bye!!" msgstr "Bye!!"
...@@ -72,7 +73,7 @@ msgstr "Circular inclusion" ...@@ -72,7 +73,7 @@ msgstr "Circular inclusion"
msgid "Color" msgid "Color"
msgstr "Color" msgstr "Color"
#: src/MateFun.hs:347 #: src/MateFun.hs:360
msgid "Colors" msgid "Colors"
msgstr "Colors" msgstr "Colors"
...@@ -80,7 +81,7 @@ msgstr "Colors" ...@@ -80,7 +81,7 @@ msgstr "Colors"
msgid "Could not open file" msgid "Could not open file"
msgstr "Could not open file" msgstr "Could not open file"
#: src/MateFun/TypeCheck.hs:75 #: src/MateFun/TypeCheck.hs:77
msgid "Division is a partial function, not defined in 0." msgid "Division is a partial function, not defined in 0."
msgstr "Division is a partial function, not defined in 0." msgstr "Division is a partial function, not defined in 0."
...@@ -88,7 +89,11 @@ msgstr "Division is a partial function, not defined in 0." ...@@ -88,7 +89,11 @@ msgstr "Division is a partial function, not defined in 0."
msgid "Does not exist" msgid "Does not exist"
msgstr "Does not exist" msgstr "Does not exist"
#: src/MateFun/TypeCheck.hs:76 #: src/MateFun/TypeCheck.hs:79
msgid "Domain intersection on function"
msgstr "Domain intersection on function"
#: src/MateFun/TypeCheck.hs:78
msgid "Empty sequence." msgid "Empty sequence."
msgstr "Empty sequence." msgstr "Empty sequence."
...@@ -100,35 +105,39 @@ msgstr "EmptyFig" ...@@ -100,35 +105,39 @@ msgstr "EmptyFig"
msgid "EmptyFig3D" msgid "EmptyFig3D"
msgstr "EmptyFig3D" msgstr "EmptyFig3D"
#: src/MateFun.hs:54 #: src/MateFun.hs:55
msgid "Enables arithmetic function usage warnings" msgid "Enables arithmetic function usage warnings"
msgstr "Enables arithmetic function usage warnings" msgstr "Enables arithmetic function usage warnings"
#: src/MateFun.hs:52 #: src/MateFun.hs:59
msgid "Enables domain intersection check on functions to load"
msgstr "Enables domain intersection check on functions to load"
#: src/MateFun.hs:53
msgid "Enables function usage warnings" msgid "Enables function usage warnings"
msgstr "Enables function usage warnings" msgstr "Enables function usage warnings"
#: src/MateFun.hs:164 #: src/MateFun.hs:61
msgid "Error" msgid "Enables verbose mode"
msgstr "Error" msgstr "Enables verbose mode"
#: src/MateFun.hs:309 #: src/MateFun.hs:322
msgid "Error in line" msgid "Error in line"
msgstr "Error in line" msgstr "Error in line"
#: src/MateFun.hs:124 #: src/MateFun.hs:126
msgid "Error reading command to interpretate." msgid "Error reading command to interpretate."
msgstr "Error reading command to interpretate." msgstr "Error reading command to interpretate."
#: src/MateFun/TypeCheck.hs:74 #: src/MateFun/TypeCheck.hs:76
msgid "Evaluation steps limit exceeded." msgid "Evaluation steps limit exceeded."
msgstr "Evaluation steps limit exceeded." msgstr "Evaluation steps limit exceeded."
#: src/MateFun/TypeCheck.hs:70 #: src/MateFun/TypeCheck.hs:72
msgid "Expected elements of" msgid "Expected elements of"
msgstr "Expected elements of" msgstr "Expected elements of"
#: src/MateFun.hs:47 #: src/MateFun.hs:48 src/MateFun.hs:97
msgid "FILE" msgid "FILE"
msgstr "FILE" msgstr "FILE"
...@@ -136,11 +145,11 @@ msgstr "FILE" ...@@ -136,11 +145,11 @@ msgstr "FILE"
msgid "Figure" msgid "Figure"
msgstr "Figure" msgstr "Figure"
#: src/MateFun.hs:345 #: src/MateFun.hs:358
msgid "Figures" msgid "Figures"
msgstr "Figures" msgstr "Figures"
#: src/MateFun.hs:287 src/MateFun.hs:288 #: src/MateFun.hs:300 src/MateFun.hs:301
msgid "Found" msgid "Found"
msgstr "Found" msgstr "Found"
...@@ -148,7 +157,7 @@ msgstr "Found" ...@@ -148,7 +157,7 @@ msgstr "Found"
msgid "Function" msgid "Function"
msgstr "Function" msgstr "Function"
#: src/MateFun.hs:360 #: src/MateFun.hs:373
msgid "Graph" msgid "Graph"
msgstr "Graph" msgstr "Graph"
...@@ -160,31 +169,31 @@ msgstr "Gray" ...@@ -160,31 +169,31 @@ msgstr "Gray"
msgid "Green" msgid "Green"
msgstr "Green" msgstr "Green"
#: src/MateFun.hs:343 #: src/MateFun.hs:356
msgid "Integer" msgid "Integer"
msgstr "Integer" msgstr "Integer"
#: src/MateFun/TypeCheck.hs:83 #: src/MateFun.hs:340
msgid "Interpreter"
msgstr "Interpreter"
#: src/MateFun.hs:327
msgid "Interpreter Commands:" msgid "Interpreter Commands:"
msgstr "Interpreter Commands:" msgstr "Interpreter Commands:"
#: src/MateFun/TypeCheck.hs:71 #: src/MateFun/TypeCheck.hs:73
msgid "Invalid index." msgid "Invalid index."
msgstr "Invalid index." msgstr "Invalid index."
#: src/MateFun.hs:163 #: src/MateFun.hs:174
msgid "Loading" msgid "Loading"
msgstr "Loading" msgstr "Loading"
#: src/MateFun.hs:230 #: src/MateFun.hs:243
msgid "No File" msgid "No File"
msgstr "No File" msgstr "No File"
#: src/MateFun.hs:140 #: src/MateFun/DomainIntersection.hs:16
msgid "No domain intersection"
msgstr "No domain intersection"
#: src/MateFun.hs:143
msgid "OUTError reading command to interpretate." msgid "OUTError reading command to interpretate."
msgstr "OUTError reading command to interpretate." msgstr "OUTError reading command to interpretate."
...@@ -192,15 +201,15 @@ msgstr "OUTError reading command to interpretate." ...@@ -192,15 +201,15 @@ msgstr "OUTError reading command to interpretate."
msgid "On definition of" msgid "On definition of"
msgstr "On definition of" msgstr "On definition of"
#: src/MateFun/TypeCheck.hs:57 #: src/MateFun/TypeCheck.hs:59
msgid "On set definition" msgid "On set definition"
msgstr "On set definition" msgstr "On set definition"
#: src/MateFun/TypeCheck.hs:72 #: src/MateFun/TypeCheck.hs:74
msgid "Out of range index." msgid "Out of range index."
msgstr "Out of range index." msgstr "Out of range index."
#: src/MateFun.hs:49 #: src/MateFun.hs:50 src/MateFun.hs:97
msgid "PATH" msgid "PATH"
msgstr "PATH" msgstr "PATH"
...@@ -208,7 +217,7 @@ msgstr "PATH" ...@@ -208,7 +217,7 @@ msgstr "PATH"
msgid "Please report this error with code" msgid "Please report this error with code"
msgstr "Please report this error with code" msgstr "Please report this error with code"
#: src/MateFun.hs:344 #: src/MateFun.hs:357
msgid "Real" msgid "Real"
msgstr "Real" msgstr "Real"
...@@ -220,15 +229,15 @@ msgstr "Red" ...@@ -220,15 +229,15 @@ msgstr "Red"
msgid "Set" msgid "Set"
msgstr "Set" msgstr "Set"
#: src/MateFun.hs:50 #: src/MateFun.hs:51
msgid "Sets a path PATH where to find the program to evaluate" msgid "Sets a path PATH where to find the program to evaluate"
msgstr "Sets a path PATH where to find the program to evaluate" msgstr "Sets a path PATH where to find the program to evaluate"
#: src/MateFun.hs:48 #: src/MateFun.hs:49
msgid "Sets the file FILE with the program to evaluate" msgid "Sets the file FILE with the program to evaluate"
msgstr "Sets the file FILE with the program to evaluate" msgstr "Sets the file FILE with the program to evaluate"
#: src/MateFun/TypeCheck.hs:63 #: src/MateFun/TypeCheck.hs:65
msgid "The element" msgid "The element"
msgstr "The element" msgstr "The element"
...@@ -240,27 +249,23 @@ msgstr "The number of arguments does not match with domain of the function" ...@@ -240,27 +249,23 @@ msgstr "The number of arguments does not match with domain of the function"
msgid "There is a chance that its value is out of the set." msgid "There is a chance that its value is out of the set."
msgstr "There is a chance that its value is out of the set." msgstr "There is a chance that its value is out of the set."
#: src/MateFun/TypeCheck.hs:73 #: src/MateFun/TypeCheck.hs:75
msgid "Tuple length is not the expected" msgid "Tuple length is not the expected"
msgstr "Tuple length is not the expected" msgstr "Tuple length is not the expected"
#: src/MateFun.hs:90 #: src/MateFun.hs:97
msgid "Usage: MateFun [-c FILE] [-p PATH] [-f] [-i]" msgid "Usage"
msgstr "Usage: MateFun [-c FILE] [-p PATH] [-f] [-i]" msgstr "Usage"
#: src/MateFun/TypeCheck.hs:68 #: src/MateFun/TypeCheck.hs:70
msgid "Value" msgid "Value"
msgstr "Value" msgstr "Value"
#: src/MateFun/TypeCheck.hs:64 #: src/MateFun/TypeCheck.hs:66
msgid "Variable" msgid "Variable"
msgstr "Variable" msgstr "Variable"
#: src/MateFun/Warning.hs:21 #: src/MateFun.hs:57
msgid "Warning"
msgstr "Warning"
#: src/MateFun.hs:56
msgid "Web Mode" msgid "Web Mode"
msgstr "Web Mode" msgstr "Web Mode"
...@@ -272,7 +277,7 @@ msgstr "White" ...@@ -272,7 +277,7 @@ msgstr "White"
msgid "Yellow" msgid "Yellow"
msgstr "Yellow" msgstr "Yellow"
#: src/MateFun/TypeCheck.hs:75 #: src/MateFun/TypeCheck.hs:77
msgid "Zero division." msgid "Zero division."
msgstr "Zero division." msgstr "Zero division."
...@@ -280,15 +285,19 @@ msgstr "Zero division." ...@@ -280,15 +285,19 @@ msgstr "Zero division."
msgid "against" msgid "against"
msgstr "against" msgstr "against"
#: src/MateFun/TypeCheck.hs:69 #: src/MateFun/DomainIntersection.hs:18
msgid "and"
msgstr "and"
#: src/MateFun/TypeCheck.hs:71
msgid "because the following condition is false" msgid "because the following condition is false"
msgstr "because the following condition is false" msgstr "because the following condition is false"
#: src/MateFun.hs:268 #: src/MateFun.hs:281
msgid "but expected" msgid "but expected"
msgstr "but expected" msgstr "but expected"
#: src/MateFun/TypeCheck.hs:70 #: src/MateFun/TypeCheck.hs:72
msgid "but found" msgid "but found"
msgstr "but found" msgstr "but found"
...@@ -304,7 +313,7 @@ msgstr "color" ...@@ -304,7 +313,7 @@ msgstr "color"
msgid "color3D" msgid "color3D"
msgstr "color3D" msgstr "color3D"
#: src/MateFun.hs:309 src/MateFun/TypeCheck.hs:85 #: src/MateFun.hs:322
msgid "column" msgid "column"
msgstr "column" msgstr "column"
...@@ -324,11 +333,11 @@ msgstr "cylinder" ...@@ -324,11 +333,11 @@ msgstr "cylinder"
msgid "depends on itself." msgid "depends on itself."
msgstr "depends on itself." msgstr "depends on itself."
#: src/MateFun/TypeCheck.hs:63 #: src/MateFun/TypeCheck.hs:65
msgid "does not belong to any defined set." msgid "does not belong to any defined set."
msgstr "does not belong to any defined set." msgstr "does not belong to any defined set."
#: src/MateFun/TypeCheck.hs:68 #: src/MateFun/TypeCheck.hs:70
msgid "does not belong to set" msgid "does not belong to set"
msgstr "does not belong to set" msgstr "does not belong to set"
...@@ -336,6 +345,10 @@ msgstr "does not belong to set" ...@@ -336,6 +345,10 @@ msgstr "does not belong to set"
msgid "duplicate elements" msgid "duplicate elements"
msgstr "duplicate elements" msgstr "duplicate elements"
#: src/MateFun/TypeCheck.hs:80
msgid "evaluates true for multiple conditions on function"
msgstr "evaluates true for multiple conditions on function"
#: src/MateFun/ReservedNames.hs:67 src/MateFun/ReservedNames.hs:83 #: src/MateFun/ReservedNames.hs:67 src/MateFun/ReservedNames.hs:83
msgid "exit" msgid "exit"
msgstr "exit" msgstr "exit"
...@@ -344,7 +357,7 @@ msgstr "exit" ...@@ -344,7 +357,7 @@ msgstr "exit"
msgid "expression" msgid "expression"
msgstr "expression" msgstr "expression"
#: src/MateFun.hs:164 src/MateFun/Parser.hs:217 src/MateFun/TypeCheck.hs:84 #: src/MateFun.hs:175 src/MateFun/Parser.hs:217
msgid "file" msgid "file"
msgstr "file" msgstr "file"
...@@ -376,11 +389,15 @@ msgstr "in" ...@@ -376,11 +389,15 @@ msgstr "in"
msgid "include" msgid "include"
msgstr "include" msgstr "include"
#: src/MateFun/DomainIntersection.hs:17
msgid "intersection between conditions"
msgstr "intersection between conditions"
#: src/MateFun/ReservedNames.hs:99 #: src/MateFun/ReservedNames.hs:99
msgid "is not defined." msgid "is not defined."
msgstr "is not defined." msgstr "is not defined."
#: src/MateFun/TypeCheck.hs:76 #: src/MateFun/TypeCheck.hs:78
msgid "is partial, not defined for empty sequences." msgid "is partial, not defined for empty sequences."
msgstr "is partial, not defined for empty sequences." msgstr "is partial, not defined for empty sequences."
...@@ -396,7 +413,7 @@ msgstr "join" ...@@ -396,7 +413,7 @@ msgstr "join"