KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl/pp: move static functions out of header file

This commit is contained in:
Keith Whitwell 2009-12-23 15:57:06 +00:00
parent cdd25ab8cf
commit b2a615e3cd
4 changed files with 206 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/glsl/SConscript
View File

@ -18,6 +18,7 @@ sources = [
'pp/sl_pp_process.c',
'pp/sl_pp_purify.c',
'pp/sl_pp_token.c',
'pp/sl_pp_token_util.c',
'pp/sl_pp_version.c',
'cl/sl_cl_parse.c',
]

1
src/glsl/pp/Makefile
View File

@ -20,6 +20,7 @@ C_SOURCES = \
sl_pp_process.c \
sl_pp_purify.c \
sl_pp_token.c \
sl_pp_token_util.c \
sl_pp_version.c
include ../Makefile.template

182
src/glsl/pp/sl_pp_token_util.c Normal file
View File

@ -0,0 +1,182 @@
/**************************************************************************
*
* Copyright 2009 VMware, Inc.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
**************************************************************************/
#include <assert.h>
#include <stdlib.h>
#include "sl_pp_token_util.h"
int
sl_pp_token_buffer_init(struct sl_pp_token_buffer *buffer,
struct sl_pp_context *context)
{
buffer->context = context;
buffer->size = 0;
buffer->capacity = 64;
buffer->tokens = malloc(buffer->capacity * sizeof(struct sl_pp_token_info));
if (!buffer->tokens) {
return -1;
}
return 0;
}
void
sl_pp_token_buffer_destroy(struct sl_pp_token_buffer *buffer)
{
free(buffer->tokens);
}
int
sl_pp_token_buffer_get(struct sl_pp_token_buffer *buffer,
struct sl_pp_token_info *out)
{
/* Pop from stack first if not empty. */
if (buffer->size) {
*out = buffer->tokens[--buffer->size];
return 0;
}
assert(buffer->context);
return sl_pp_token_get(buffer->context, out);
}
void
sl_pp_token_buffer_unget(struct sl_pp_token_buffer *buffer,
const struct sl_pp_token_info *in)
{
/* Resize if needed. */
if (buffer->size == buffer->capacity) {
buffer->capacity += 64;
buffer->tokens = realloc(buffer->tokens,
buffer->capacity * sizeof(struct sl_pp_token_info));
assert(buffer->tokens);
}
/* Push token on stack. */
buffer->tokens[buffer->size++] = *in;
}
int
sl_pp_token_buffer_skip_white(struct sl_pp_token_buffer *buffer,
struct sl_pp_token_info *out)
{
if (sl_pp_token_buffer_get(buffer, out)) {
return -1;
}
while (out->token == SL_PP_WHITESPACE) {
if (sl_pp_token_buffer_get(buffer, out)) {
return -1;
}
}
return 0;
}
int
sl_pp_token_peek_init(struct sl_pp_token_peek *peek,
struct sl_pp_token_buffer *buffer)
{
peek->buffer = buffer;
peek->size = 0;
peek->capacity = 64;
peek->tokens = malloc(peek->capacity * sizeof(struct sl_pp_token_info));
if (!peek->tokens) {
return -1;
}
return 0;
}
void
sl_pp_token_peek_destroy(struct sl_pp_token_peek *peek)
{
/* Abort. */
while (peek->size) {
sl_pp_token_buffer_unget(peek->buffer, &peek->tokens[--peek->size]);
}
free(peek->tokens);
}
int
sl_pp_token_peek_get(struct sl_pp_token_peek *peek,
struct sl_pp_token_info *out)
{
/* Get token from buffer. */
if (sl_pp_token_buffer_get(peek->buffer, out)) {
return -1;
}
/* Save it. */
if (peek->size == peek->capacity) {
peek->capacity += 64;
peek->tokens = realloc(peek->tokens,
peek->capacity * sizeof(struct sl_pp_token_info));
assert(peek->tokens);
}
peek->tokens[peek->size++] = *out;
return 0;
}
void
sl_pp_token_peek_commit(struct sl_pp_token_peek *peek)
{
peek->size = 0;
}
int
sl_pp_token_peek_to_buffer(const struct sl_pp_token_peek *peek,
struct sl_pp_token_buffer *buffer)
{
unsigned int i;
if (sl_pp_token_buffer_init(buffer, NULL)) {
return -1;
}
for (i = peek->size; i > 0; i--) {
sl_pp_token_buffer_unget(buffer, &peek->tokens[i - 1]);
}
return 0;
}
int
sl_pp_token_peek_skip_white(struct sl_pp_token_peek *peek,
struct sl_pp_token_info *out)
{
if (sl_pp_token_peek_get(peek, out)) {
return -1;
}
while (out->token == SL_PP_WHITESPACE) {
if (sl_pp_token_peek_get(peek, out)) {
return -1;
}
}
return 0;
}

152
src/glsl/pp/sl_pp_token_util.h
View File

@ -46,72 +46,24 @@ struct sl_pp_token_buffer {
struct sl_pp_token_info *tokens;
};
static int
int
sl_pp_token_buffer_init(struct sl_pp_token_buffer *buffer,
struct sl_pp_context *context)
{
buffer->context = context;
buffer->size = 0;
buffer->capacity = 64;
buffer->tokens = malloc(buffer->capacity * sizeof(struct sl_pp_token_info));
if (!buffer->tokens) {
return -1;
}
return 0;
}
struct sl_pp_context *context);
static void
sl_pp_token_buffer_destroy(struct sl_pp_token_buffer *buffer)
{
free(buffer->tokens);
}
void
sl_pp_token_buffer_destroy(struct sl_pp_token_buffer *buffer);
static int
int
sl_pp_token_buffer_get(struct sl_pp_token_buffer *buffer,
struct sl_pp_token_info *out)
{
/* Pop from stack first if not empty. */
if (buffer->size) {
*out = buffer->tokens[--buffer->size];
return 0;
}
struct sl_pp_token_info *out);
assert(buffer->context);
return sl_pp_token_get(buffer->context, out);
}
static void
void
sl_pp_token_buffer_unget(struct sl_pp_token_buffer *buffer,
const struct sl_pp_token_info *in)
{
/* Resize if needed. */
if (buffer->size == buffer->capacity) {
buffer->capacity += 64;
buffer->tokens = realloc(buffer->tokens,
buffer->capacity * sizeof(struct sl_pp_token_info));
assert(buffer->tokens);
}
const struct sl_pp_token_info *in);
/* Push token on stack. */
buffer->tokens[buffer->size++] = *in;
}
static int
int
sl_pp_token_buffer_skip_white(struct sl_pp_token_buffer *buffer,
struct sl_pp_token_info *out)
{
if (sl_pp_token_buffer_get(buffer, out)) {
return -1;
}
while (out->token == SL_PP_WHITESPACE) {
if (sl_pp_token_buffer_get(buffer, out)) {
return -1;
}
}
return 0;
}
struct sl_pp_token_info *out);
/*
@ -126,86 +78,26 @@ struct sl_pp_token_peek {
struct sl_pp_token_info *tokens;
};
static int
int
sl_pp_token_peek_init(struct sl_pp_token_peek *peek,
struct sl_pp_token_buffer *buffer)
{
peek->buffer = buffer;
peek->size = 0;
peek->capacity = 64;
peek->tokens = malloc(peek->capacity * sizeof(struct sl_pp_token_info));
if (!peek->tokens) {
return -1;
}
return 0;
}
struct sl_pp_token_buffer *buffer);
static void
sl_pp_token_peek_destroy(struct sl_pp_token_peek *peek)
{
/* Abort. */
while (peek->size) {
sl_pp_token_buffer_unget(peek->buffer, &peek->tokens[--peek->size]);
}
free(peek->tokens);
}
void
sl_pp_token_peek_destroy(struct sl_pp_token_peek *peek);
static int
int
sl_pp_token_peek_get(struct sl_pp_token_peek *peek,
struct sl_pp_token_info *out)
{
/* Get token from buffer. */
if (sl_pp_token_buffer_get(peek->buffer, out)) {
return -1;
}
struct sl_pp_token_info *out);
/* Save it. */
if (peek->size == peek->capacity) {
peek->capacity += 64;
peek->tokens = realloc(peek->tokens,
peek->capacity * sizeof(struct sl_pp_token_info));
assert(peek->tokens);
}
peek->tokens[peek->size++] = *out;
return 0;
}
void
sl_pp_token_peek_commit(struct sl_pp_token_peek *peek);
static void
sl_pp_token_peek_commit(struct sl_pp_token_peek *peek)
{
peek->size = 0;
}
static int
int
sl_pp_token_peek_to_buffer(const struct sl_pp_token_peek *peek,
struct sl_pp_token_buffer *buffer)
{
unsigned int i;
struct sl_pp_token_buffer *buffer);
if (sl_pp_token_buffer_init(buffer, NULL)) {
return -1;
}
for (i = peek->size; i > 0; i--) {
sl_pp_token_buffer_unget(buffer, &peek->tokens[i - 1]);
}
return 0;
}
static int
int
sl_pp_token_peek_skip_white(struct sl_pp_token_peek *peek,
struct sl_pp_token_info *out)
{
if (sl_pp_token_peek_get(peek, out)) {
return -1;
}
while (out->token == SL_PP_WHITESPACE) {
if (sl_pp_token_peek_get(peek, out)) {
return -1;
}
}
return 0;
}
struct sl_pp_token_info *out);
#endif /* SL_PP_TOKEN_UTIL_H */