Skip to content
This repository was archived by the owner on Oct 21, 2024. It is now read-only.

Commit 1c90f06

Browse files
HZZcodeHZZcode
authored
v1.3.4+1.8
1 parent 7307b15 commit 1c90f06

File tree

5 files changed

+39
-37
lines changed

5 files changed

+39
-37
lines changed

‎CMakeLists.txt.user

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE QtCreatorProject>
3-
<!-- Written by QtCreator 14.0.1, 2024-10-17T08:17:00. -->
3+
<!-- Written by QtCreator 14.0.1, 2024-10-18T08:10:27. -->
44
<qtcreator>
55
<data>
66
<variable>EnvironmentId</variable>
@@ -101,22 +101,22 @@
101101
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.7.2 MinGW 64-bit</value>
102102
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.7.2 MinGW 64-bit</value>
103103
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.672.win64_mingw_kit</value>
104-
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
104+
<value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
105105
<value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
106106
<value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
107107
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
108108
<value type="QString" key="CMake.Build.Type">Debug</value>
109109
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
110110
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
111111
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
112-
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
112+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
113+
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
114+
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
115+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
113116
-DCMAKE_BUILD_TYPE:STRING=Debug
114-
-DCMAKE_GENERATOR:STRING=Ninja
115117
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
116-
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
117-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
118-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
119-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
118+
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
119+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
120120
<value type="int" key="EnableQmlDebugging">0</value>
121121
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\14354\Documents\Qt Projects\MicrologicIDE\build\Desktop_Qt_6_7_2_MinGW_64_bit-Debug</value>
122122
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@@ -166,14 +166,14 @@
166166
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
167167
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
168168
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
169-
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
169+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
170+
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
171+
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
172+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
170173
-DCMAKE_BUILD_TYPE:STRING=Release
171-
-DCMAKE_GENERATOR:STRING=Ninja
172174
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
173-
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
174-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
175-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
176-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
175+
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
176+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
177177
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\14354\Documents\Qt Projects\MicrologicIDE\build\Desktop_Qt_6_7_2_MinGW_64_bit-Release</value>
178178
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
179179
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -222,14 +222,14 @@
222222
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
223223
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
224224
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
225-
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
225+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
226+
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
227+
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
228+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
226229
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
227-
-DCMAKE_GENERATOR:STRING=Ninja
228230
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
229-
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
230-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
231-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
232-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
231+
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
232+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
233233
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\14354\Documents\Qt Projects\MicrologicIDE\build\Desktop_Qt_6_7_2_MinGW_64_bit-RelWithDebInfo</value>
234234
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
235235
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -276,14 +276,14 @@
276276
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
277277
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
278278
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
279-
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
279+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
280+
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
281+
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
282+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
280283
-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo
281-
-DCMAKE_GENERATOR:STRING=Ninja
282284
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
283-
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
284-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
285-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
286-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
285+
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
286+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
287287
<value type="int" key="EnableQmlDebugging">0</value>
288288
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\14354\Documents\Qt Projects\MicrologicIDE\build\Desktop_Qt_6_7_2_MinGW_64_bit-Profile</value>
289289
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
@@ -331,14 +331,14 @@
331331
<value type="int" key="CMake.Configure.BaseEnvironment">2</value>
332332
<value type="bool" key="CMake.Configure.ClearSystemEnvironment">false</value>
333333
<valuelist type="QVariantList" key="CMake.Configure.UserEnvironmentChanges"/>
334-
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
334+
<value type="QString" key="CMake.Initial.Parameters">-DCMAKE_GENERATOR:STRING=Ninja
335+
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
336+
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
337+
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}
335338
-DCMAKE_BUILD_TYPE:STRING=MinSizeRel
336-
-DCMAKE_GENERATOR:STRING=Ninja
337339
-DQT_QMAKE_EXECUTABLE:FILEPATH=%{Qt:qmakeExecutable}
338-
-DCMAKE_CXX_COMPILER:FILEPATH=%{Compiler:Executable:Cxx}
339-
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}
340-
-DCMAKE_C_COMPILER:FILEPATH=%{Compiler:Executable:C}
341-
-DCMAKE_PREFIX_PATH:PATH=%{Qt:QT_INSTALL_PREFIX}</value>
340+
-DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=%{BuildConfig:BuildDirectory:NativeFilePath}/.qtc/package-manager/auto-setup.cmake
341+
-DCMAKE_CXX_FLAGS_INIT:STRING=%{Qt:QML_DEBUG_FLAG}</value>
342342
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\14354\Documents\Qt Projects\MicrologicIDE\build\Desktop_Qt_6_7_2_MinGW_64_bit-MinSizeRel</value>
343343
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
344344
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
@@ -414,7 +414,7 @@
414414
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
415415
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
416416
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
417-
<value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/14354/Documents/Qt Projects/MicrologicIDE/build/Desktop_Qt_6_7_2_MinGW_64_bit-Debug</value>
417+
<value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/14354/Documents/Qt Projects/MicrologicIDE/build/Desktop_Qt_6_7_2_MinGW_64_bit-Release</value>
418418
</valuemap>
419419
<value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
420420
</valuemap>

‎Micrologic.exe

4.5 KB
Binary file not shown.

‎MicrologicIDE.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ std::vector<bool> MicrologicIDE::grammarCheck(std::vector<std::string> lines){
702702
else if(args[0]=="echo"){
703703
ans[i]=true;
704704
}
705-
else if(args[0]=="@echo"&&args.size()==2){
705+
else if((args[0]=="@echo"||args[0]=="@clock"||args[0]=="@per-step")&&args.size()==2){
706706
if(isNumber(args[1])){
707707
if(args[1]=="0"||args[1]=="1") ans[i]=true;
708708
else ans[i]=false;

‎MicrologicIDE.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class MicrologicIDE : public QMainWindow
3232
std::string debugInfo{};
3333

3434
std::vector<std::string> blankChars;
35-
const std::vector<std::string> keys={"end","line","wline","N","A","R","T","C","P","set","check","input:","input","output:","output","tick","tick!","speed","path","open","safe-open","mod","check-mods","block","block-type","tag","type","check-input","check-output","inspect","del","export","echo","@echo","clear","help","lang"};
36-
const std::vector<std::string> unsafeKeys={"end","check","output","tick","tick!","path","check-mods","block-type","tag","type","check-input","check-output","inspect","del","export","clear","help","lang"};
35+
const std::vector<std::string> keys={"end","line","wline","N","A","R","T","C","P","set","check","input:","input","output:","output","tick","tick!","speed","path","open","safe-open","mod","check-mods","block","block-type","tag","type","check-input","check-output","inspect","del","export","echo","@echo","@clock","@per-step","clear","help","lang"};
36+
const std::vector<std::string> unsafeKeys={"end","check","output","tick","tick!","path","check-mods","block-type","tag","type","check-input","check-output","inspect","del","export","@clock","@per-step","clear","help","lang"};
3737

3838
const std::vector<std::string> nums={"0","1","2","3","4","5","6","7","8","9"};
3939

‎help.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ del [BLOCKTYPE] [BLOCK] Delete a designated bl
6060
del line [ALINE] Delete a designated line. No bugs were found in tn test but you'd betterbe careful of those blocks without line connection.
6161
export Export current blocks.
6262
echo [MESSAGE] Outputs a message.
63-
@echo [ECHO] Set whether to echo messages. Requires 0 or 1.
63+
@echo [SHOW] Set whether to echo messages. Requires 0 or 1.
64+
@clock [SHOW] Set whether to show time of command running. Requires 0 or 1.
65+
@pre-tick [SHOW] Set whether to run file step by step. Requires 0 or 1.
6466
clear Clear the interpreter' data and restart.
6567
help Show help.
6668
help [COMMAND] Show help for a designated command.

0 commit comments

Comments
 (0)