Graph3D.pas

Правка грамматики в связи с :

Configuration/GlobalAssemblyInfo.cs

@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "3";
 	public const string Build = "0";
-	public const string Revision = "1583";
+	public const string Revision = "1585";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
 %COREVERSION%=0
-%REVISION%=1583
+%REVISION%=1585
 %MINOR%=3
 %MAJOR%=3

Parsers/PascalABCParserNewSaushkin/ABCPascal.cs

@@ -1,9 +1,9 @@
 //
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
-//  Machine:  IVAN-PC
-//  DateTime: 19.11.2017 18:01:23
-//  UserName: Ivan
+//  Machine:  DESKTOP-A6LT9RI
+//  DateTime: 02.12.2017 20:22:59
+//  UserName: ?????????
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
 //

Parsers/PascalABCParserNewSaushkin/ABCPascal.y

@@ -2913,7 +2913,7 @@ simple_expr_or_nothing
 	}
 	|
 	{
-		$$ = new int32_const(int.MaxValue);
+		$$ = null;
 	}
 	;
 
@@ -2924,7 +2924,7 @@ format_expr
 		}
     | tkColon simple_expr_or_nothing                        
         { 
-			$$ = new format_expr(new int32_const(int.MaxValue), $2, null, @$); 
+			$$ = new format_expr(null, $2, null, @$); 
 		}
     | simple_expr tkColon simple_expr_or_nothing tkColon simple_expr   
         { 
@@ -2932,7 +2932,7 @@ format_expr
 		}
     | tkColon simple_expr_or_nothing tkColon simple_expr   
         { 
-			$$ = new format_expr(new int32_const(int.MaxValue), $2, $4, @$); 
+			$$ = new format_expr(null, $2, $4, @$); 
 		}
     ;
 
@@ -3169,6 +3169,10 @@ variable
         	if (el.Count==1 && el.expressions[0] is format_expr) 
         	{
         		var fe = el.expressions[0] as format_expr;
+        		if (fe.expr == null)
+        			fe.expr = new int32_const(int.MaxValue,@3);
+        		if (fe.format1 == null)
+        			fe.format1 = new int32_const(int.MaxValue,@3);
         		$$ = new slice_expr($1 as addressed_value,fe.expr,fe.format1,fe.format2,@$);
 			}   
 			else $$ = new indexer($1 as addressed_value,el, @$);

Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs

@@ -1,9 +1,9 @@
 // (see accompanying GPPGcopyright.rtf)
 
 // GPPG version 1.3.6
-// Machine:  IVAN-PC
-// DateTime: 19.11.2017 18:01:25
-// UserName: Ivan
+// Machine:  DESKTOP-A6LT9RI
+// DateTime: 02.12.2017 20:23:00
+// UserName: ?????????
 // Input file <ABCPascal.y>
 
 // options: no-lines gplex
@@ -4943,7 +4943,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
         break;
       case 575: // format_expr -> tkColon, simple_expr_or_nothing
 { 
-			CurrentSemanticValue.ex = new format_expr(new int32_const(int.MaxValue), ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); 
+			CurrentSemanticValue.ex = new format_expr(new int32_const(int.MaxValue,CurrentLocationSpan), ValueStack[ValueStack.Depth-1].ex, null, CurrentLocationSpan); 
 		}
         break;
       case 576: // format_expr -> simple_expr, tkColon, simple_expr_or_nothing, tkColon, 
@@ -4954,7 +4954,7 @@ public partial class GPPGParser: ShiftReduceParser<PascalABCSavParser.Union, Lex
         break;
       case 577: // format_expr -> tkColon, simple_expr_or_nothing, tkColon, simple_expr
 { 
-			CurrentSemanticValue.ex = new format_expr(new int32_const(int.MaxValue), ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); 
+			CurrentSemanticValue.ex = new format_expr(new int32_const(int.MaxValue,CurrentLocationSpan), ValueStack[ValueStack.Depth-3].ex, ValueStack[ValueStack.Depth-1].ex, CurrentLocationSpan); 
 		}
         break;
       case 578: // relop -> tkEqual

Parsers/PascalABCParserNewSaushkin/PABC.ymc

@@ -179,6 +179,8 @@ script=
 
 
 
+
+
 
 
 

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.3.0.1583'
+!define VERSION '3.3.0.1585'

VisualPascalABCNET/DS/RunManager/RunManager.cs

@@ -282,8 +282,11 @@ namespace VisualPascalABC
                     EventedStreamReaderList.Add(PRunner.process.StandardError, ErrorStreamId + fileName, InputEncoding);
                 }
             }
-            catch(Exception)
+            catch(Exception e)
             {
+#if DEBUG
+                File.AppendAllText("logRun.txt", e.Message + Environment.NewLine + e.StackTrace + Environment.NewLine);
+#endif
                 RemoveFromTables(fileName);
                 throw;
             }