todo 6.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172
  1. Update that simple tokenizer compulsory test so things will compile
  2. (done) Fix #include <stdio.h> to read include directive correctly
  3. txt/orig state of affairs:
  4. The problem is that there are two ways to interpret line,col:
  5. With respect to txt
  6. With respect to orig
  7. This isn't a problem when txt and orig point to the same character, as in:
  8. int in\
  9. dex
  10. int \
  11. index /*Here, the backslash break should be gobbled up by the space identifier*/
  12. line,col has no ambiguity as to where it should point. However, when they point to different characters (i.e. at the beginning of a line):
  13. \
  14. int index
  15. line,col could either point to orig or to the first real character. Thus, we will do the latter.
  16. Moreover, will a newline followed by backslash breaks generate a token that gobbles up said breaks? I believe it will, but no need to call this mandatory.
  17. Thus, on a lookup with a txt pointer, the line/col/orig should match the real character and not preceding backslash breaks.
  18. I've been assuming that every token starts with its first character, neglecting the case where a line starts with backslash breaks. The question is, given the txt pointer to the first character, where should the derived orig land?
  19. Currently, the orig lands after the beginning backslash breaks, when instead it should probably land before them.
  20. Here's what the tokenizer's text anchoring needs:
  21. Broken/unbroken text pointer -> line/col
  22. Unbroken contents per token to identify identifier text
  23. Original contents per token to rebuild the document
  24. Ability to change "original contents" so the document will be saved with modifications
  25. Ability to insert new tokens
  26. Solution:
  27. New tokens will typically have identical txt and orig, yea even the same pointer.
  28. txt/txt_size for unbroken contents, orig/orig_size for original
  29. modify orig to change the document
  30. txt identifies identifier text
  31. Line lookup tables are used to resolve txt/orig pointers; other pointers can't be resolved in the same fashion and may require traversing backward through the list.
  32. What this means:
  33. Token txt/txt_size, orig/orig_size, orig_lines, txt_lines, and tok_point_lookup are all still correct.
  34. Token line,col will be removed
  35. Other improvements to do:
  36. Sanity check the point lookups like crazy
  37. Remove the array() structures in token_list, as these are supposed to be read-only
  38. Make sure tok_point_lookup returns correct values for every single pointer possible, particularly those in orig that are on backslash-breaks
  39. Convert the tok_message_queue into an array of messages bound to tokens.
  40. Ask Rusty about the trailing newline in this case:
  41. /* Blah
  42. *
  43. * blah
  44. */
  45. Here, rather than the trailing space being blank, it is "blank" from the comment perspective.
  46. May require deeper analysis.
  47. Todos from ccan_tokenizer.h
  48. /*
  49. Assumption: Every token fits in one and exactly one line
  50. Counterexamples:
  51. Backslash-broken lines
  52. Multiline comments
  53. Checks to implement in the tokenizer:
  54. is the $ character used in an identifier (some configurations of GCC allow this)
  55. are there potentially ambiguous sequences used in a string literal (e.g. "\0000")
  56. Are there stray characters? (e.g. '\0', '@', '\b')
  57. Are there trailing spaces at the end of lines (unless said spaces consume the entire line)?
  58. Are there trailing spaces after a backslash-broken line?
  59. Fixes todo:
  60. backslash-newline sequence should register as an empty character, and the tokenizer's line value should be incremented accordingly.
  61. */
  62. Lex angle bracket strings in #include
  63. Check the rules in the documentation
  64. Examine the message queue as part of testing the tokenizer:
  65. Make sure there are no bug messages
  66. Make sure files compile with no warnings
  67. For the tokenizer sanity check, make sure integers and floats have valid suffixes respectively
  68. (e.g. no TOK_F for an integer, no TOK_ULL for a floating)
  69. Update the scan_number sanity checks
  70. (done) Move scan_number et al. to a separate C file
  71. Test:
  72. Overflow and underflow floats
  73. 0x.p0
  74. (done) 0755f //octal 0755 with invalid suffix
  75. (done) 0755e1 //floating 7550
  76. Figure out how keywords will be handled.
  77. Preprocessor directives are <strike>case-insensitive</strike> actually case-sensitive (except __VA_ARGS__)
  78. All C keywords are case sensitive
  79. __VA_ARGS__ should be read as an identifier unless it's in the expansion of a macro. Otherwise, GCC generates a warning.
  80. We are in the expansion of a macro after <startline> <space> # <space>
  81. Don't forget about __attribute__
  82. Except for __VA_ARGS__, all preprocessor keywords are proceeded by <startline> <space> # <space>
  83. Solution:
  84. All the words themselves will go into one opkw dictionary, and for both type and opkw, no distinction will be made between preprocessor and normal keywords.
  85. Instead, int type will become short type; unsigned short cpp:1;
  86. Merge
  87. Commit ccan_tokenizer to the ccan repo
  88. Introduce ccan_tokenizer to ccanlint
  89. Write testcases for scanning all available operators
  90. Support integer and floating point suffices (e.g. 500UL, 0.5f)
  91. Examine the message queue after tokenizing
  92. Make sure single-character operators have an opkw < 128
  93. Make sure c_dictionary has no duplicate entries
  94. Write verifiers for other types than TOK_WHITE
  95. What's been done:
  96. Operator table has been organized
  97. Merged Rusty's changes
  98. Fixed if -> while in finalize
  99. Fixed a couple mistakes in run-simple-token.c testcases themselves
  100. Expected orig/orig_size sizes weren't right
  101. Made token_list_sanity_check a public function and used it throughout run-simple-token.c
  102. Tests succeed and pass valgrind
  103. Lines/columns of every token are recorded
  104. (done) Fix "0\nstatic"
  105. (done) Write tests to make sure backslash-broken lines have correct token locations.
  106. (done) Correctly handle backslash-broken lines
  107. One plan: Separate the scanning code from the reading code. Scanning sends valid ranges to reading, and reading fills valid tokens for the tokenizer/scanner to properly add
  108. Another plan: Un-break backslash-broken lines into another copy of the input. Create an array of the positions of each real line break so
  109. Annotate message queue messages with current token
  110. Conversion to make:
  111. From:
  112. Position in unbroken text
  113. To:
  114. Real line number
  115. Real offset from start of line
  116. Thus, we want an array of real line start locations wrt the unbroken text
  117. Here is a bro\
  118. ken line. Here is a
  119. real line.
  120. <LINE>Here is a bro<LINE>ken line. Here is a
  121. <LINE>real line.
  122. If we know the position of the token text wrt the unbroken text, we can look up the real line number and offset using only the array of real line start positions within the unbroken text.
  123. Because all we need is the orig and orig_size with respect to the unbroken text to orient