Skip to content

Commit

Permalink
updated files for version 0.4.2
Browse files Browse the repository at this point in the history
additional changes:
modified .gitignore to include all QtCreator user settings files
added ibcp.h as dependency of application so it shows up in QtCreator
optimized table.cpp to use the pre-defined StrStr_ExprInfo structure
corrected numerous spacing to tabs (due to QtCreator FakeVIM bugs)
added missing old expected results for translator test #14
updated regtestn.bat to run and compare all translator tests
made some other minor cleanups
  • Loading branch information
thunder422 committed Aug 2, 2013
1 parent 229af22 commit a5d3434
Show file tree
Hide file tree
Showing 9 changed files with 354 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .gitignore
@@ -1,3 +1,3 @@
/build/
/nbproject/
CMakeLists.txt.user
CMakeLists.txt.user*
3 changes: 2 additions & 1 deletion CMakeLists.txt
Expand Up @@ -49,7 +49,7 @@ set(ibcp_COPYRIGHT_YEAR 2013)

set(ibcp_RELEASE_MAJOR 0)
set(ibcp_RELEASE_MINOR 4)
set(ibcp_RELEASE_PATCH 1)
set(ibcp_RELEASE_PATCH 2)

set(ibcp_RELEASE_STRING v${ibcp_RELEASE_MAJOR}.${ibcp_RELEASE_MINOR})
if (ibcp_RELEASE_PATCH LESS 0)
Expand Down Expand Up @@ -193,6 +193,7 @@ qt4_add_resources(ibcp_RCC_SOURCES ${ibcp_RESOURCES})

# add the executable
add_executable(ibcp
ibcp.h
autoenums.h
test_names.h
${ibcp_SOURCES}
Expand Down
4 changes: 2 additions & 2 deletions regtestn.bat
Expand Up @@ -38,8 +38,8 @@ rem ask this question)
rem

del expression*.txt translator*.txt
for %%i in (test/expression*.dat test/translator0*.dat) do (
for %%i in (test/expression*.dat test/translator*.dat) do (
ibcp -n test\%%i >%%~ni.txt
)
comp test\expression*.txt expression*.txt
comp test\translator0*.txt translator0*.txt
comp test\translator*.txt translator*.txt
27 changes: 27 additions & 0 deletions rel_notes.txt
Expand Up @@ -38,6 +38,33 @@ Planned Roadmap (updated 2013-04-05):
To be defined...


Release 0.4.2 (2013-08-01)

Project developmental release - implementation of the new
translator scheme continues with the translation of all LET
statements and some improvements were made to the core
translator routines.

- implemented more functional done stack class
- reformatted token status messages
- corrected issues with unary operators and parser errors
- corrected a dependency cmake issue with autoenums.h
- changed how token codes are checked
- corrected minor issues in old translator routines
- auto-generate memory error suppression file for Qt version

Note: Some issues in the old translator have been corrected and
now all tests succeed when using the old translator. Since some
of the expected results are now different (due to the change in
LET statement translations), the unmodified expected results
files are saved and the test scripts use these when present.
Temporary scripts were added for testing the new translator
routines. All tests containing assignments work correctly with
the new translator routines. The regtestn.bat batch does not
currently work very well as the old translator expected results
files confuse it.


Release 0.4.1 (2013-07-05)

Project developmental release - implementation of the new
Expand Down
28 changes: 10 additions & 18 deletions table.cpp
Expand Up @@ -228,7 +228,7 @@ static ExprInfo IntInt_ExprInfo(Null_Code, Operands(IntInt));

static ExprInfo Str_ExprInfo(Null_Code, Operands(Str));
static ExprInfo StrInt_ExprInfo(Null_Code, Operands(StrInt));
static ExprInfo StrStr_ExprInfo(Null_Code, Operands(StrStr)); //?
static ExprInfo StrStr_ExprInfo(Null_Code, Operands(StrStr));
static ExprInfo StrStrInt_ExprInfo(Null_Code, Operands(StrStrInt));

static ExprInfo StrIntInt_ExprInfo(Null_Code, Operands(StrIntInt));
Expand Down Expand Up @@ -498,7 +498,7 @@ static TableEntry tableEntries[] =
{ // Instr2_Code
IntFuncP_TokenType, OneWord_Multiple,
"INSTR(", "INSTR2(", Multiple_Flag, 2, Integer_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
&StrStr_ExprInfo
},
{ // Instr3_Code
IntFuncP_TokenType, OneWord_Multiple,
Expand Down Expand Up @@ -740,8 +740,7 @@ static TableEntry tableEntries[] =
{ // AssignListStr_Code
Operator_TokenType, OneWord_Multiple,
"=", "AssignList$", Reference_Flag, 4, String_DataType,
new ExprInfo(Null_Code, Operands(StrStr)),
NULL, Null_TokenMode, Assign_CmdHandler
&StrStr_ExprInfo, NULL, Null_TokenMode, Assign_CmdHandler
},
{ // AssignListMix_Code
Operator_TokenType, OneWord_Multiple,
Expand Down Expand Up @@ -793,8 +792,7 @@ static TableEntry tableEntries[] =
},
{ // CatStr_Code
Operator_TokenType, OneChar_Multiple,
"+", "+$", Null_Flag, 40, String_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
"+", "+$", Null_Flag, 40, String_DataType, &StrStr_ExprInfo
},
{ // SubI1_Code
Operator_TokenType, OneChar_Multiple,
Expand Down Expand Up @@ -881,8 +879,7 @@ static TableEntry tableEntries[] =
},
{ // EqStr_Code
Operator_TokenType, OneChar_Multiple,
"=", "=$", Null_Flag, 30, Integer_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
"=", "=$", Null_Flag, 30, Integer_DataType, &StrStr_ExprInfo
},
{ // GtI1_Code
Operator_TokenType, OneChar_Multiple,
Expand All @@ -899,8 +896,7 @@ static TableEntry tableEntries[] =
},
{ // GtStr_Code
Operator_TokenType, OneChar_Multiple,
">", ">$", Null_Flag, 32, Integer_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
">", ">$", Null_Flag, 32, Integer_DataType, &StrStr_ExprInfo
},
{ // GtEqI1_Code
Operator_TokenType, OneChar_Multiple,
Expand All @@ -917,8 +913,7 @@ static TableEntry tableEntries[] =
},
{ // GtEqStr_Code
Operator_TokenType, OneChar_Multiple,
">=", ">=$", Null_Flag, 32, Integer_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
">=", ">=$", Null_Flag, 32, Integer_DataType, &StrStr_ExprInfo
},
{ // LtI1_Code
Operator_TokenType, OneChar_Multiple,
Expand All @@ -935,8 +930,7 @@ static TableEntry tableEntries[] =
},
{ // LtStr_Code
Operator_TokenType, OneChar_Multiple,
"<", "<$", Null_Flag, 32, Integer_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
"<", "<$", Null_Flag, 32, Integer_DataType, &StrStr_ExprInfo
},
{ // LtEqI1_Code
Operator_TokenType, OneChar_Multiple,
Expand All @@ -953,8 +947,7 @@ static TableEntry tableEntries[] =
},
{ // LtEqStr_Code
Operator_TokenType, OneChar_Multiple,
"<=", "<=$", Null_Flag, 32, Integer_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
"<=", "<=$", Null_Flag, 32, Integer_DataType, &StrStr_ExprInfo
},
{ // NotEqI1_Code
Operator_TokenType, OneChar_Multiple,
Expand All @@ -971,8 +964,7 @@ static TableEntry tableEntries[] =
},
{ // NotEqStr_Code
Operator_TokenType, OneChar_Multiple,
"<>", "<>$", Null_Flag, 30, Integer_DataType,
new ExprInfo(Null_Code, Operands(StrStr))
"<>", "<>$", Null_Flag, 30, Integer_DataType, &StrStr_ExprInfo
},
{ // AbsInt_Code
IntFuncP_TokenType, OneWord_Multiple,
Expand Down

0 comments on commit a5d3434

Please sign in to comment.