efelon/stubser
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

- improved globals and expected initializatian and testing

Browse Source
This commit is contained in:
Martin Winkler
2017-03-13 19:46:07 +00:00
parent 1fa51576e3
commit 506bb44c58
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/stubser/stubser.c
View File

@@ -63,13 +63,25 @@ STATIC void createVariableSpecificInit(const char* aVariableTemplate, FILE *aFil
return; return;
} }
if (NULL != strstr(aVariable->dataType, "*")) if (NULL != strstr(aVariable->dataType, "*") || aVariable->array)
{ {
if (aVariable->array)
{
fprintf(aFile, "\t(void) memset(");
fprintf(aFile, aVariableTemplate, aVariable->name);
fprintf(aFile, ", 0x55, sizeof(%s)); /* %s */" NEWLINES, aVariable->name, aVariable->dataType);
}
else
{
fprintf(aFile, "\t");
fprintf(aFile, aVariableTemplate, aVariable->name); fprintf(aFile, aVariableTemplate, aVariable->name);
fprintf(aFile, " = NULL;" NEWLINES); fprintf(aFile, " = NULL;" NEWLINES);
} }
}
else if (isDatatypeStandard(aVariable)) else if (isDatatypeStandard(aVariable))
{ {
fprintf(aFile, "\t");
fprintf(aFile, aVariableTemplate, aVariable->name); fprintf(aFile, aVariableTemplate, aVariable->name);
fprintf(aFile, " = 0x55;" NEWLINES); fprintf(aFile, " = 0x55;" NEWLINES);
} }
@@ -88,18 +100,27 @@ STATIC void createVariableSpecificCheck(FILE *aFile, cfile_variable_t *aVariable
return; return;
} }
if (NULL != strstr(aVariable->dataType, "*")) if (NULL != strstr(aVariable->dataType, "*") || aVariable->array)
{
if (aVariable->array)
{
fprintf(aFile, "\tCU_ASSERT_MEMORY_CHECK(\"%s\", %s, "STUBVARIABLE_EXTENDED_S1", sizeof(%s));"NEWLINES, aVariable->name, aVariable->name,
aVariable->name, aVariable->name);
}
else
{ {
fprintf(aFile, "\tCU_ASSERT_PTR_EQUAL(%s, "STUBVARIABLE_EXTENDED_S1");"NEWLINES, aVariable->name, aVariable->name); fprintf(aFile, "\tCU_ASSERT_PTR_EQUAL(%s, "STUBVARIABLE_EXTENDED_S1");"NEWLINES, aVariable->name, aVariable->name);
} }
}
else if (isDatatypeStandard(aVariable)) else if (isDatatypeStandard(aVariable))
{ {
fprintf(aFile, "\tCU_ASSERT_EQUAL(%s, "STUBVARIABLE_EXTENDED_S1");"NEWLINES, aVariable->name, aVariable->name); fprintf(aFile, "\tCU_ASSERT_EQUAL(%s, "STUBVARIABLE_EXTENDED_S1");"NEWLINES, aVariable->name, aVariable->name);
} }
else else
{ {
fprintf(aFile, "\tCU_ASSERT_MEMORY_CHECK(\"%s\", &%s, &"STUBVARIABLE_EXTENDED_S1", sizeof(%s));"NEWLINES, aVariable->name, aVariable->name, aVariable->name, fprintf(aFile, "\tCU_ASSERT_MEMORY_CHECK(\"%s\", &%s, &"STUBVARIABLE_EXTENDED_S1", sizeof(%s));"NEWLINES, aVariable->name, aVariable->name,
aVariable->name); aVariable->name, aVariable->name);
} }
} }
@@ -119,13 +140,13 @@ STATIC int8_t createStubExpected(char *aNoSuffix, FILE *aFile, FILE *aHeader, cf
work = aList->head; work = aList->head;
while (work) while (work)
{ {
if (CVARIABLE_TYPE_REGULAR != work->type) if (CVARIABLE_TYPE_REGULAR != work->type || NULL != strstr(work->dataType, "const"))
{ {
work = work->next; work = work->next;
continue; continue;
} }
fprintf(aFile, "%s "STUBVARIABLE_EXTENDED_S1";"NEWLINES, work->dataType, work->name); fprintf(aFile, "%s "STUBVARIABLE_EXTENDED_S1"%s;"NEWLINES, work->dataType, work->name, (work->array ? work->array : ""));
fprintf(aHeader, "extern %s "STUBVARIABLE_EXTENDED_S1";"NEWLINES, work->dataType, work->name); fprintf(aHeader, "extern %s "STUBVARIABLE_EXTENDED_S1"%s;"NEWLINES, work->dataType, work->name, (work->array ? work->array : ""));
work = work->next; work = work->next;
} }
@@ -140,7 +161,7 @@ STATIC int8_t createStubExpected(char *aNoSuffix, FILE *aFile, FILE *aHeader, cf
work = work->next; work = work->next;
continue; continue;
} }
createVariableSpecificInit("\t"STUBVARIABLE_EXTENDED_S1, aFile, work); createVariableSpecificInit(STUBVARIABLE_EXTENDED_S1, aFile, work);
work = work->next; work = work->next;
} }
@@ -170,8 +191,8 @@ STATIC int8_t createStubGlobals(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfi
work = work->next; work = work->next;
continue; continue;
} }
fprintf(aFile, "%s %s;"NEWLINES, work->dataType, work->name); fprintf(aFile, "%s %s%s;"NEWLINES, work->dataType, work->name, (work->array ? work->array : ""));
fprintf(aHeader, "extern %s %s;"NEWLINES, work->dataType, work->name); fprintf(aHeader, "extern %s %s%s;"NEWLINES, work->dataType, work->name, (work->array ? work->array : ""));
work = work->next; work = work->next;
} }
@@ -185,7 +206,7 @@ STATIC int8_t createStubGlobals(char *aNoSuffix, FILE *aFile, FILE *aHeader, cfi
work = work->next; work = work->next;
continue; continue;
} }
createVariableSpecificInit("\t%s", aFile, work); createVariableSpecificInit("%s", aFile, work);
work = work->next; work = work->next;
} }