Commitdef0e05

committed

Introduce galley concept; move shifting lint or galley, and now call it shifting sereies

1 parentde236fd commitdef0e05Copy full SHA for def0e05

File tree

+48

-29

lines changed

+48

-29

lines changed

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,3 +76,30 @@ Blob::DataDup(char *& data_out, size_t& size_out)`
`76`	`76`	`memcpy(data_out, data + begin, size_out);`
`77`	`77`	`}`
`78`	`78`
	`79`	`+`
	`80`	`+std::list<std::string>`
	`81`	`+GalleySeries::Extract(Blob &blob)`
	`82`	`+{`
	`83`	`+ std::list<std::string> res;`
	`84`	`+`
	`85`	`+if (stamp.isFixedSize())`
	`86`	`+ {`
	`87`	`+while (1)`
	`88`	`+ {`
	`89`	`+ std::string el = blob.ShiftSingleStampStr(stamp);`
	`90`	`+if (el.empty())`
	`91`	`+break;`
	`92`	`+ res.push_back(el);`
	`93`	`+ }`
	`94`	`+ }`
	`95`	`+else`
	`96`	`+ {`
	`97`	`+printf("Not implemented yet!");`
	`98`	`+exit(1);`
	`99`	`+ }`
	`100`	`+`
	`101`	`+return res;`
	`102`	`+}`
	`103`	`+`
	`104`	`+`
	`105`	`+`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#defineBLOB_H`
`4`	`4`
`5`	`5`	`#include<string>`
	`6`	`+#include<list>`
`6`	`7`
`7`	`8`	`classStampGeneric;`
`8`	`9`
`@@ -25,4 +26,19 @@ class Blob`
`25`	`26`	`std::stringShiftSingleStampStr(StampGeneric &stmp);`
`26`	`27`	`};`
`27`	`28`
	`29`	`+classGalleyBase`
	`30`	`+{`
	`31`	`+`
	`32`	`+};`
	`33`	`+`
	`34`	`+classGalleySeries :publicGalleyBase`
	`35`	`+{`
	`36`	`+protected:`
	`37`	`+ StampGeneric &stamp;`
	`38`	`+public:`
	`39`	`+GalleySeries(StampGeneric & stamp_arg) : stamp(stamp_arg) {};`
	`40`	`+ std::list<std::string>Extract(Blob &blob);`
	`41`	`+};`
	`42`	`+`
	`43`	`+`
`28`	`44`	`#endif/BLOB_H/`

Lines changed: 0 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,27 +29,3 @@ StampGeneric::Extract(Blob &blob)`
`29`	`29`	`return (void *) res;`
`30`	`30`	`}`
`31`	`31`
`32`		`-`
`33`		`-std::list<std::string>StampList::ExtractStrList(Blob &blob)`
`34`		`-{`
`35`		`- std::list<std::string> res;`
`36`		`-`
`37`		`-if (target_stamp.isFixedSize())`
`38`		`- {`
`39`		`-while (1)`
`40`		`- {`
`41`		`- std::string el = blob.ShiftSingleStampStr(target_stamp);`
`42`		`-if (el.empty())`
`43`		`-break;`
`44`		`- res.push_back(el);`
`45`		`- }`
`46`		`- }`
`47`		`-else`
`48`		`- {`
`49`		`-printf("Not implemented yet!");`
`50`		`-exit(1);`
`51`		`- }`
`52`		`-`
`53`		`-return res;`
`54`		`-}`
`55`		`-`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,6 @@ class StampList: public StampGeneric`
`27`	`27`	`StampGeneric& target_stamp;`
`28`	`28`	`public:`
`29`	`29`	`StampList(StampGeneric &stamp) : target_stamp(stamp) {};`
`30`		`-`
`31`		`-virtual std::list<std::string>ExtractStrList(Blob &blob);`
`32`		`-`
`33`		`-`
`34`	`30`	`};`
`35`	`31`
`36`	`32`	`#endif/* STAMP_H*/`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ main()`
`66`	`66`	`char *ptr;`
`67`	`67`	`size_t size;`
`68`	`68`
`69`		`-TEST_START(8);`
	`69`	`+TEST_START(4);`
`70`	`70`
`71`	`71`	`/* Test that ShiftSingleStampStr shifts ok with StampTwoChars stamp*/`
`72`	`72`	`{/* 1..3*/`
`@@ -85,6 +85,8 @@ main()`
`85`	`85`	`free(ptr);`
`86`	`86`	`}`
`87`	`87`
	`88`	`+/* This should be moved to Galley test later*/`
	`89`	`+#if0`
`88`	`90`	`/* Test that StamList really splits the whole blob to the specified stamps */`
`89`	`91`	`{ /* 4..7 */`
`90`	`92`	`std::string expected1 = "12";`
`@@ -112,6 +114,8 @@ main()`
`112`	`114`
`113`	`115`	`ok(res.empty(), "ExtractStrList: The rest of the list is empty");`
`114`	`116`	`}`
	`117`	`+#endif`
	`118`	`+`
`115`	`119`	`/* Chekc that data is shifted till blob data is empty*/`
`116`	`120`	`{/* 8*/`
`117`	`121`	`char sample_two_bytes[]="12";`

Comments

(0)