Skip to content

Commit 2224077

Browse files
committed
Show warning message and dont remove debugger placeholders
1 parent 306ccd4 commit 2224077

File tree

4 files changed

+79
-51
lines changed

4 files changed

+79
-51
lines changed

BasicPawn/Controls and Forms/FormMain.resx

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -549,47 +549,47 @@
549549
<value>
550550
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
551551
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
552-
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABE
553-
CQAAAk1TRnQBSQFMAgEBAgEAAQgBEAEIAhABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
554-
ARADAAEBAQABIAYAARASAAMuAUgDPAFoAxMBGvQAAaYBoQGkAf8DAAH/Az4BbAMGAQgYAAGqAgAB/9QA
555-
A1gBvAHnAeUB5wH/A1oB5AMtAUUDAAEBFAABqgIAAf8BsgIAAf8QAAOEAf8DgwH/A4IB/wOBAf8DgAH/
556-
AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf+AAAMMARADXAHPAeUB4wHl
557-
Af8DVwHCAx0BKQQAAl8BTAHzAaoCAAH/AaoCAAH/AaoCAAH/Ab4CAAH/AcUBgAEAAf8BsgIAAf8MAAOF
558-
Af8B+gHfAcEB/wH6Ad8BwQH/AfoB3wHBAf8B+gHfAcEB/wH6Ad8BwQH/AfoB3wHBAf8B+gHfAcEB/wH6
559-
Ad8BwQH/AfsB4wHJAf8B/AHrAdkB/wH8Ae8B4AH/AfwB7wHgAf8B/AHrAdkB/wH7AeMByQH/AwAB/4QA
560-
AxwBJwNkAecB3wHdAd8B/wNMAZEDCwEPAaoCAAH/AesBpgEAAf8B5wGiAQAB/wHjAZ0BAAH/Ad8BmQEA
561-
Af8B2wGUAQAB/wHFAYABAAH/AbICAAH/CAADhgL/AfwB+QL/AfwB+QH/AfoB3wHBAv8B/AH5Av8B/AH5
562-
Af8B+gHfAcEC/wH8AfkC/wH8AfkB/wH8AesB2QH/AQABmgEAAf8BAAGaAQAB/wEAAZoBAAH/AQABmgEA
563-
Av8B/QH7Af8DAAH/iAADJgE4A2oB+QNAAf0DNQFYAaoCAAH/Ae8BqgEAAf8B6wGmAQAB/wHnAaIBAAH/
564-
AeMBnQEAAf8B3wGZAQAB/wHbAZQBAAH/AcUBgAEAAf8BqgIAAf8EAAKHAYgC/wH8AfkC/wH8AfkB/wH6
565-
Ad8BwQL/AfwB+QL/AfwB+QH/AfoB3wHBAv8B/AH5Av8B/AH5Af8B/AHvAeAB/wEAAZoBAAH/AQAB5gEA
566-
Af8BAAHmAQAB/wEAAZoBAAL/Af0B/AH/AwAB/4wAAy0BRgNZAfUDXwHzAaoCAAH/AfMBrgEAAf8B7wGq
567-
AQAB/wHrAaYBAAH/AecBogEAAf8B4wGdAQAB/wHKAYYBAAH/AbMCAAH/CAACiAGJAf8B+gHfAcEB/wH6
568-
Ad8BwQH/AfoB3wHBAf8B+gHfAcEB/wH6Ad8BwQH/AfoB3wHBAf8B+wHlAc4B/wH8Ae0B3gH/Af0B9gHu
569-
Af8BAAHIAQAB/wEAAesBgAH/AQAB5gEAAf8BAAGaAQAB/wH8Ae8B4AH/AwAB/5AAA08BmwNXAbcCWQFC
570-
AfUBqgIAAf8BqgIAAf8BqgIAAf8BxAGCAQAB/wHPAYsBAAH/AbUCAAH/AwMBBAgAA4oC/wH8AfkB/wIA
571-
Ad8B/wIAAd8B/wIAAd8B/wIAAd8B/wH6Ad8BwQL/Af0B/AH/AcwCAAH/AcwCAAH/AcwCAAH/AQAByAEA
572-
Af8BAAGaAQAB/wEAAZoBAAL/Af0B+wH/AwAB/4wAAxkBIwNUAa8DOwFjAzYBWQNEAXoDTgGUA04BmQGq
573-
AgAB/wG2AgAB/wNbAcYDFgEeCAACiwGMAv8B/AH5Af8CAAHfAf8BqwGtAfQB/wGsAa4B9AH/AgAB3AH/
574-
AfsB4gHIAv8B/QH8Af8B5QGwAQAB/wHMAgAB/wHMAgAC/wH+Af0B/wH8Ae8B4AL/Af0B+wL/AfwB+gH/
575-
AwAB/4wAA0QBegNRAZ8DIAEuAy8BSQNHAYIDSAGDA1YBsQGqAgAB/wNYAcEDXQHKAzYBWQgAAowBjQH/
576-
AfoB3wHBAf8CAAHfAf8BqwGtAfQB/wGrAa0B9AH/AgAB3wH/AfwB7QHeAf8B4wGlAQAB/wHMAgAB/wHj
577-
AaUBAAH/AcwCAAH/AfwB7QHeAf8B+gHfAcEB/wH6Ad8BwQH/AfoB3wHBAf8DAAH/jAADTAGSA0oBiQMr
578-
AUIDQAFvA1IBowNRAZ8DVgGxA1sBwwNUAa8DVgGzA0gBhQgAA44C/wH8AfkB/wIAAd8B/wIAAd8B/wIA
579-
Ad8B/wHMAgAB/wHMAgAB/wHMAgAB/wHlAbABAAH/AfwB7QHeAv8B/QH8Av8B/QH6Af8B+gHfAcEC/wH8
580-
AfkC/wH8AfkB/wMAAf+MAANMAY8DTAGSAzgBXQNFAX0DRwGBA04BmANTAaoDVgG0A1YBswNZAb4DRwGB
581-
CAACjwGQAv8B/AH5Av8B/AH5Af8B+gHfAcEC/wH8AfkC/wH9AfwB/wH8Ae0B3gL/Af0B/AL/Af0B+wH/
582-
AfsB4gHIAv8B/AH5Av8B/AH5Af8B+gHfAcEC/wH8AfkC/wH8AfkB/wOAAf+MAANKAY0DVQGyAz8BbANZ
583-
Ab4DVQG1A04BmANMAZMDUAGeA1MBpQNbAcMDMQFOCAACkAGRAf8BngIAAf8BnAIAAf8BmgIAAf8BlwIA
584-
Af8BlAIAAf8BkAIAAf8BjQIAAf8BiwIAAf8BiQIAAf8BiAIAAf8BiAIAAf8BiAIAAf8BiAIAAf8BiAIA
585-
Af8DgQH/jAADMwFSA18B2wNKAY0DVgG0A18B2wNdAdMDXAHMA1kBvgNbAcsDUwGlAwcBCQgAA5IB/wHS
586-
As8B/wHSAs8B/wHQAs0B/wHOAsoB/wHLAsUB/wHHAsEB/wHDAr0B/wHAAbkBugH/Ab0BtQG2Af8BuwGz
587-
AbQB/wG6AbIBswH/AboBsgGzAf8BugGyAbMB/wG6AbIBswH/AoEBggH/kAADQAFxA18B4wNbAcgDYAHe
588-
A2AB3gNcAd8DXAHqA1sBywMcASgMAAKTAZQB/wKSAZMB/wORAf8DkAH/Ao4BjwH/Ao0BjgH/AowBjQH/
589-
A4sB/wOKAf8DiQH/A4gB/wOHAf8ChQGGAf8ChAGFAf8CgwGEAf8CggGDAf+UAAMzAVMDVgG2A18B4wNh
590-
Ae4DXgHYA04BlAMVAR3QAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQABHwP/
591-
BAABDwHfAv8EAAEHAc8GAAEEAQcGAAGAAQMGAAHAAQEGAAHgAQMGAAHwAQMGAAHgAQMGAAHgAQMGAAHg
592-
AQMGAAHgAQMGAAHgAQMGAAHgAQMGAAHwAQcGAAH4AQ8C/wQACw==
552+
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAA+
553+
CQAAAk1TRnQBSQFMAgEBAgEABRABAAEQAQAE/wEhAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEB
554+
AQABIAYAARASAAMuAUgDPAFoAxMBGvQAAaYBoQGkAf8DAAH/Az4BbAMGAQgYAAGqAgAB/9QAA1gBvAHn
555+
AeUB5wH/A1oB5AMtAUUDAAEBFAABqgIAAf8BsgIAAf8QAAOEAf8DgwH/A4IB/wOBAf8DgAH/AwAB/wMA
556+
Af8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf+AAAMMARADXAHPAeUB4wHlAf8DVwHC
557+
Ax0BKQQAAl8BTAHzAaoCAAH/AaoCAAH/AaoCAAH/Ab4CAAH/AcUBgAEAAf8BsgIAAf8MAAOFAf8B+gHf
558+
AcEB/wH6Ad8BwQH/AfoB3wHBAf8B+gHfAcEB/wH6Ad8BwQH/AfoB3wHBAf8B+gHfAcEB/wH6Ad8BwQH/
559+
AfsB4wHJAf8B/AHrAdkB/wH8Ae8B4AH/AfwB7wHgAf8B/AHrAdkB/wH7AeMByQH/AwAB/4QAAxwBJwNk
560+
AecB3wHdAd8B/wNMAZEDCwEPAaoCAAH/AesBpgEAAf8B5wGiAQAB/wHjAZ0BAAH/Ad8BmQEAAf8B2wGU
561+
AQAB/wHFAYABAAH/AbICAAH/CAADhgL/AfwB+QL/AfwB+QH/AfoB3wHBAv8B/AH5Av8B/AH5Af8B+gHf
562+
AcEC/wH8AfkC/wH8AfkB/wH8AesB2QH/AQABmgEAAf8BAAGaAQAB/wEAAZoBAAH/AQABmgEAAv8B/QH7
563+
Af8DAAH/iAADJgE4A2oB+QNAAf0DNQFYAaoCAAH/Ae8BqgEAAf8B6wGmAQAB/wHnAaIBAAH/AeMBnQEA
564+
Af8B3wGZAQAB/wHbAZQBAAH/AcUBgAEAAf8BqgIAAf8EAAKHAYgC/wH8AfkC/wH8AfkB/wH6Ad8BwQL/
565+
AfwB+QL/AfwB+QH/AfoB3wHBAv8B/AH5Av8B/AH5Af8B/AHvAeAB/wEAAZoBAAH/AQAB5gEAAf8BAAHm
566+
AQAB/wEAAZoBAAL/Af0B/AH/AwAB/4wAAy0BRgNZAfUDXwHzAaoCAAH/AfMBrgEAAf8B7wGqAQAB/wHr
567+
AaYBAAH/AecBogEAAf8B4wGdAQAB/wHKAYYBAAH/AbMCAAH/CAACiAGJAf8B+gHfAcEB/wH6Ad8BwQH/
568+
AfoB3wHBAf8B+gHfAcEB/wH6Ad8BwQH/AfoB3wHBAf8B+wHlAc4B/wH8Ae0B3gH/Af0B9gHuAf8BAAHI
569+
AQAB/wEAAesBgAH/AQAB5gEAAf8BAAGaAQAB/wH8Ae8B4AH/AwAB/5AAA08BmwNXAbcCWQFCAfUBqgIA
570+
Af8BqgIAAf8BqgIAAf8BxAGCAQAB/wHPAYsBAAH/AbUCAAH/AwMBBAgAA4oC/wH8AfkB/wIAAd8B/wIA
571+
Ad8B/wIAAd8B/wIAAd8B/wH6Ad8BwQL/Af0B/AH/AcwCAAH/AcwCAAH/AcwCAAH/AQAByAEAAf8BAAGa
572+
AQAB/wEAAZoBAAL/Af0B+wH/AwAB/4wAAxkBIwNUAa8DOwFjAzYBWQNEAXoDTgGUA04BmQGqAgAB/wG2
573+
AgAB/wNbAcYDFgEeCAACiwGMAv8B/AH5Af8CAAHfAf8BqwGtAfQB/wGsAa4B9AH/AgAB3AH/AfsB4gHI
574+
Av8B/QH8Af8B5QGwAQAB/wHMAgAB/wHMAgAC/wH+Af0B/wH8Ae8B4AL/Af0B+wL/AfwB+gH/AwAB/4wA
575+
A0QBegNRAZ8DIAEuAy8BSQNHAYIDSAGDA1YBsQGqAgAB/wNYAcEDXQHKAzYBWQgAAowBjQH/AfoB3wHB
576+
Af8CAAHfAf8BqwGtAfQB/wGrAa0B9AH/AgAB3wH/AfwB7QHeAf8B4wGlAQAB/wHMAgAB/wHjAaUBAAH/
577+
AcwCAAH/AfwB7QHeAf8B+gHfAcEB/wH6Ad8BwQH/AfoB3wHBAf8DAAH/jAADTAGSA0oBiQMrAUIDQAFv
578+
A1IBowNRAZ8DVgGxA1sBwwNUAa8DVgGzA0gBhQgAA44C/wH8AfkB/wIAAd8B/wIAAd8B/wIAAd8B/wHM
579+
AgAB/wHMAgAB/wHMAgAB/wHlAbABAAH/AfwB7QHeAv8B/QH8Av8B/QH6Af8B+gHfAcEC/wH8AfkC/wH8
580+
AfkB/wMAAf+MAANMAY8DTAGSAzgBXQNFAX0DRwGBA04BmANTAaoDVgG0A1YBswNZAb4DRwGBCAACjwGQ
581+
Av8B/AH5Av8B/AH5Af8B+gHfAcEC/wH8AfkC/wH9AfwB/wH8Ae0B3gL/Af0B/AL/Af0B+wH/AfsB4gHI
582+
Av8B/AH5Av8B/AH5Af8B+gHfAcEC/wH8AfkC/wH8AfkB/wOAAf+MAANKAY0DVQGyAz8BbANZAb4DVQG1
583+
A04BmANMAZMDUAGeA1MBpQNbAcMDMQFOCAACkAGRAf8BngIAAf8BnAIAAf8BmgIAAf8BlwIAAf8BlAIA
584+
Af8BkAIAAf8BjQIAAf8BiwIAAf8BiQIAAf8BiAIAAf8BiAIAAf8BiAIAAf8BiAIAAf8BiAIAAf8DgQH/
585+
jAADMwFSA18B2wNKAY0DVgG0A18B2wNdAdMDXAHMA1kBvgNbAcsDUwGlAwcBCQgAA5IB/wHSAs8B/wHS
586+
As8B/wHQAs0B/wHOAsoB/wHLAsUB/wHHAsEB/wHDAr0B/wHAAbkBugH/Ab0BtQG2Af8BuwGzAbQB/wG6
587+
AbIBswH/AboBsgGzAf8BugGyAbMB/wG6AbIBswH/AoEBggH/kAADQAFxA18B4wNbAcgDYAHeA2AB3gNc
588+
Ad8DXAHqA1sBywMcASgMAAKTAZQB/wKSAZMB/wORAf8DkAH/Ao4BjwH/Ao0BjgH/AowBjQH/A4sB/wOK
589+
Af8DiQH/A4gB/wOHAf8ChQGGAf8ChAGFAf8CgwGEAf8CggGDAf+UAAMzAVMDVgG2A18B4wNhAe4DXgHY
590+
A04BlAMVAR3QAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQABHwP/BAABDwHf
591+
Av8EAAEHAc8GAAEEAQcGAAGAAQMGAAHAAQEGAAHgAQMGAAHwAQMGAAHgAQMGAAHgAQMGAAHgAQMGAAHg
592+
AQMGAAHgAQMGAAHgAQMGAAHwAQcGAAH4AQ8C/wQACw==
593593
</value>
594594
</data>
595595
<metadata name="StatusStrip_BasicPawn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

BasicPawn/Controls and Forms/FormMultiCompiler.vb

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,22 @@
1515
'along with this program. If Not, see < http: //www.gnu.org/licenses/>.
1616

1717

18+
Imports System.Text.RegularExpressions
19+
1820
Public Class FormMultiCompiler
1921
Private g_mMainForm As FormMain
2022

2123
Private g_sSourceFiles As String()
2224
Private g_bTestingOnly As Boolean = False
25+
Private g_bCleanDebuggerPlaceholder As Boolean = False
2326

2427
Private g_tMainThread As Threading.Thread
2528

26-
Public Sub New(f As FormMain, sSourceFiles As String(), bTestingOnly As Boolean)
29+
Public Sub New(f As FormMain, sSourceFiles As String(), bTestingOnly As Boolean, bCleanDebuggerPlaceholder As Boolean)
2730
g_mMainForm = f
2831
g_sSourceFiles = sSourceFiles
2932
g_bTestingOnly = bTestingOnly
33+
g_bCleanDebuggerPlaceholder = bCleanDebuggerPlaceholder
3034

3135
' This call is required by the designer.
3236
InitializeComponent()
@@ -68,18 +72,23 @@ Public Class FormMultiCompiler
6872
For i = 0 To g_sSourceFiles.Length - 1
6973
Dim sSourceFile As String = g_sSourceFiles(i)
7074
Dim sSource As String = IO.File.ReadAllText(g_sSourceFiles(i))
75+
Dim sCompilerOutput As String = ""
7176

7277
Dim sOutputFile As String = IO.Path.Combine(ClassConfigs.m_ActiveConfig.g_sOutputFolder, String.Format("{0}.unk", IO.Path.GetFileNameWithoutExtension(sSourceFile)))
7378
Dim bSuccess As Boolean = CBool(Me.Invoke(Function()
74-
With New ClassDebuggerParser(g_mMainForm)
75-
If (.HasDebugPlaceholder(sSource)) Then
76-
.CleanupDebugPlaceholder(sSource)
77-
End If
78-
End With
79-
80-
Return g_mMainForm.g_ClassTextEditorTools.CompileSource(g_bTestingOnly, sSource, sOutputFile, IO.Path.GetDirectoryName(sSourceFile), ClassConfigs.m_ActiveConfig.g_sCompilerPath, ClassConfigs.m_ActiveConfig.g_sIncludeFolders, sSourceFile)
79+
If (g_bCleanDebuggerPlaceholder) Then
80+
With New ClassDebuggerParser(g_mMainForm)
81+
If (.HasDebugPlaceholder(sSource)) Then
82+
.CleanupDebugPlaceholder(sSource)
83+
End If
84+
End With
85+
End If
86+
87+
Return g_mMainForm.g_ClassTextEditorTools.CompileSource(g_bTestingOnly, sSource, sOutputFile, IO.Path.GetDirectoryName(sSourceFile), ClassConfigs.m_ActiveConfig.g_sCompilerPath, ClassConfigs.m_ActiveConfig.g_sIncludeFolders, sSourceFile, sCompilerOutput)
8188
End Function))
8289

90+
Dim bWarning As Boolean = Regex.Match(sCompilerOutput, "\s+[0-9]+\s+\b(Warning|Warnings)\b\.").Success
91+
8392
Dim bCancel As Boolean = False
8493

8594
If (Not bSuccess) Then
@@ -96,6 +105,25 @@ Public Class FormMultiCompiler
96105
mTab.OpenFileTab(sSourceFile)
97106
mTab.SelectTab()
98107

108+
Case DialogResult.Cancel
109+
bCancel = True
110+
End Select
111+
End With
112+
End Sub)
113+
ElseIf (bWarning) Then
114+
Me.Invoke(Sub()
115+
With New Text.StringBuilder
116+
.AppendLine(String.Format("'{0}' has compiler warnings!", sSourceFile))
117+
.AppendLine("See information tab for more information.")
118+
.AppendLine()
119+
.AppendLine("Do you want to open the file now?")
120+
121+
Select Case (MessageBox.Show(Me, .ToString, "Compiler warning", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Exclamation))
122+
Case DialogResult.Yes
123+
Dim mTab = g_mMainForm.g_ClassTabControl.AddTab()
124+
mTab.OpenFileTab(sSourceFile)
125+
mTab.SelectTab()
126+
99127
Case DialogResult.Cancel
100128
bCancel = True
101129
End Select

BasicPawn/Controls and Forms/UCProjectBrowser.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ Public Class UCProjectBrowser
520520
lFiles.Add(mListViewItem.SubItems(1).Text)
521521
Next
522522

523-
Using i As New FormMultiCompiler(g_mFormMain, lFiles.ToArray, False)
523+
Using i As New FormMultiCompiler(g_mFormMain, lFiles.ToArray, False, False)
524524
i.ShowDialog(g_mFormMain)
525525
End Using
526526
Catch ex As Exception
@@ -540,7 +540,7 @@ Public Class UCProjectBrowser
540540
lFiles.Add(mListViewItem.SubItems(1).Text)
541541
Next
542542

543-
Using i As New FormMultiCompiler(g_mFormMain, lFiles.ToArray, True)
543+
Using i As New FormMultiCompiler(g_mFormMain, lFiles.ToArray, True, False)
544544
i.ShowDialog(g_mFormMain)
545545
End Using
546546
Catch ex As Exception
512 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)