updated files for version 0.5.3

also did some minor code cleanup

CMakeLists.txt

@@ -57,7 +57,7 @@ set(ibcp_COPYRIGHT_YEAR 2013)
 
 set(ibcp_RELEASE_MAJOR 0)
 set(ibcp_RELEASE_MINOR 5)
-set(ibcp_RELEASE_PATCH 2)
+set(ibcp_RELEASE_PATCH 3)
 
 set(ibcp_RELEASE_STRING v${ibcp_RELEASE_MAJOR}.${ibcp_RELEASE_MINOR})
 if (ibcp_RELEASE_PATCH LESS 0)

README

@@ -61,8 +61,8 @@ internal program code that will be executed when the program is run.
 The initial phase of encoder development is completed with support for
 remarks, variables and constants.  Several dictionaries have been
 implementing for storing the strings of the remarks, variables and
-constants.  Currently only single lines are handled though the
-dictionaries are maintained for all of the lines processed.
+constants.  Program lines are encoded and stored into program from where
+there are retreived.
 
 
 Building The Program

dictionary.h

@@ -37,7 +37,6 @@ class Dictionary
 public:
 	Dictionary(void);
 
-	void remove(quint16 index);
 	enum EntryType
 	{
 		New_Entry,
@@ -48,6 +47,7 @@ class Dictionary
 
 	quint16 add(Token *token, Qt::CaseSensitivity cs = Qt::CaseInsensitive,
 		EntryType *returnNewEntry = NULL);
+	void remove(quint16 index);
 	QString string(int index) const
 	{
 		return m_keyList.at(index);

mainwindow.cpp

@@ -115,7 +115,7 @@ MainWindow::MainWindow(QWidget *parent) :
 	// setup program model (connect to edit box changes)
 	m_programModel = new ProgramModel(this);
 	connect(m_editBox, SIGNAL(linesChanged(int, int, int, QStringList)),
-		m_programModel, SLOT(update(int,int,int,QStringList)));
+		m_programModel, SLOT(update(int, int, int, QStringList)));
 	connect(m_programModel, SIGNAL(errorListChanged(ErrorList)),
 		m_editBox, SLOT(updateErrors(ErrorList)));
 

programmodel.cpp

@@ -107,7 +107,7 @@ ProgramModel::~ProgramModel(void)
 	delete m_varIntDictionary;
 	delete m_varStrDictionary;
 
-	// NOTE need to delete all of the stored translated line lists
+	// REMOVE need to delete all of the stored translated line lists
 	for (int i = 0; i < m_lineInfo.count(); i++)
 	{
 		delete m_lineInfo.at(i).rpnList;
@@ -169,7 +169,7 @@ QString ProgramModel::debugText(int lineIndex, bool fullInfo) const
 }
 
 
-// function to return debug text of all the dictionary
+// NOTE temporary function to return debug text of all the dictionary
 QString ProgramModel::dictionariesDebugText(void)
 {
 	QString string;

rel_notes.txt

@@ -20,8 +20,6 @@ see <http://www.gnu.org/licenses/>.
 
 Planned Roadmap (updated 2013-10-06):
 
-	Integrate encoder with program model
-	Integrate encoder/program model to GUI
 	Implement initial Recreator (internal code to program text)
 	Integrate Recreator to GUI (update Edit Box)
 	Implement initial Run-time Module (for LET, PRINT and INPUT)
@@ -34,6 +32,18 @@ Planned Roadmap (updated 2013-10-06):
 	To be defined...
 
 
+Release 0.5.3 (2013-10-27)
+
+	Project developmental release - the encoder has been integrated
+	into the program model and the GUI program view.
+
+	  - program model now stores the program code (encoded)
+	  - error items no longer dependent on rpn list class
+	  - dictionary entries optionally case sensitive
+	  - test mode outputs program and dictionary contents at end
+	  - encoder test mode supports insert, replace and remove lines
+
+
 Release 0.5.2 (2013-10-06)
 
 	Project developmental release - the first phase of the encoder

translator.cpp

@@ -477,7 +477,7 @@ TokenStatus Translator::getOperand(Token *&token, DataType dataType,
 		break;  // go add token to output and push to done stack
 
 	case NoParen_TokenType:
-		// NOTE for now assume a variable
+		// REMOVE for now assume a variable
 		// TODO first check if identifier is in function dictionary
 		// TODO only a function reference if name of current function
 		m_table.setTokenCode(token, reference == None_Reference
@@ -823,7 +823,7 @@ TokenStatus Translator::processParenToken(Token *&token)
 	// determine data type (number for subscripts, any for arguments)
 	DataType dataType;
 	// TODO need to check test mode once dictionaries are implemented
-	// NOTE for now assume functions start with an 'F'
+	// REMOVE for now assume functions start with an 'F'
 	if (token->isType(Paren_TokenType) && (token->reference()
 		|| !token->string().startsWith('F', Qt::CaseInsensitive)))
 	{