Changeset 5fb32c5 in mainline for uspace/app/bdsh/tok.h

Timestamp:

2011-08-20T09:05:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c916dfc

Parents:

921b84f (diff), a0fc4be (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/bdsh/tok.h (modified) (2 diffs)

uspace/app/bdsh/tok.h

@@ -30 +30 @@
 #define TOK_H
 
+typedef enum {
+        TOKTYPE_TEXT,
+        TOKTYPE_PIPE,
+        TOKTYPE_SPACE
+} token_type_t;
+
+typedef struct {
+        char *text;
+        unsigned int byte_start;
+        unsigned int char_start;
+        size_t byte_length;
+        size_t char_length;
+        token_type_t type;
+} token_t;
+
 typedef struct {
         char *in;
-        size_t in_offset;
+        unsigned int in_offset;
+        unsigned int last_in_offset;
+        unsigned int in_char_offset;
+        unsigned int last_in_char_offset;
         
         char *outbuf;
@@ -39 +57 @@
         size_t outbuf_last_start;
         
-        char **outtok;
+        token_t *outtok;
+        token_type_t current_type;
         size_t outtok_offset;
         size_t outtok_size;
 } tokenizer_t;
 
-extern int tok_init(tokenizer_t *, char *, char **, size_t);
+extern int tok_init(tokenizer_t *, char *, token_t *, size_t);
 extern void tok_fini(tokenizer_t *);
-extern int tok_tokenize(tokenizer_t *);
+extern int tok_tokenize(tokenizer_t *, size_t *);
 
 #endif