From 43d97ad8631dd8a1ab9966f38e345627188baf47 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周四, 24 10月 2013 00:04:23 +0800
Subject: [PATCH] Refactor public and private functions

---
 libscpi/src/lexer.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index 65824df..347a505 100644
--- a/libscpi/src/lexer.c
+++ b/libscpi/src/lexer.c
@@ -38,7 +38,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "scpi/lexer.h"
+#include "lexer_private.h"
 
 /* identify character */
 static int isws(int c) {
@@ -70,7 +70,7 @@
     }
 }
 
-int SCPI_LexIsEos(lex_state_t * state) {
+int lexIsEos(lex_state_t * state) {
     return iseos(state);
 }
 
@@ -212,7 +212,7 @@
 }
 
 /* tokens */
-int SCPI_LexWhiteSpace(lex_state_t * state, token_t * token) {
+int lexWhiteSpace(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     skipWs(state);
@@ -270,7 +270,7 @@
     }
 }
 
-int SCPI_LexProgramHeader(lex_state_t * state, token_t * token) {
+int lexProgramHeader(lex_state_t * state, token_t * token) {
     int res;
     token->ptr = state->pos;
     token->type = TokUnknown;
@@ -309,7 +309,7 @@
 }
 
 /* 7.7.1 <CHARACTER PROGRAM DATA> */
-int SCPI_LexCharacterProgramData(lex_state_t * state, token_t * token) {
+int lexCharacterProgramData(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     if (!iseos(state) && isalpha(state->pos[0])) {
@@ -360,7 +360,7 @@
     return someNumbers;
 }
 
-int SCPI_LexDecimalNumericProgramData(lex_state_t * state, token_t * token) {
+int lexDecimalNumericProgramData(lex_state_t * state, token_t * token) {
     const char * rollback;
     token->ptr = state->pos;
 
@@ -385,7 +385,7 @@
 }
 
 /* 7.7.3 <SUFFIX PROGRAM DATA> */
-int SCPI_LexSuffixProgramData(lex_state_t * state, token_t * token) {
+int lexSuffixProgramData(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     skipChr(state, '/');
@@ -442,7 +442,7 @@
     return someNumbers;
 }
 
-int SCPI_LexNondecimalNumericData(lex_state_t * state, token_t * token) {
+int lexNondecimalNumericData(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
     int someNumbers = 0;
     if (skipChr(state, '#')) {
@@ -503,7 +503,7 @@
     skipQuoteProgramData(state, '\'');
 }
 
-int SCPI_LexStringProgramData(lex_state_t * state, token_t * token) {
+int lexStringProgramData(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     if (!iseos(state)) {
@@ -549,7 +549,7 @@
     return isdigit(c) && (c != '0');
 }
 
-int SCPI_LexArbitraryBlockProgramData(lex_state_t * state, token_t * token) {
+int lexArbitraryBlockProgramData(lex_state_t * state, token_t * token) {
     int i;
     int j = 0;
     const char * ptr = state->pos;
@@ -622,7 +622,7 @@
 
 // TODO: 7.7.7.2-2 recursive - any program data
 
-int SCPI_LexProgramExpression(lex_state_t * state, token_t * token) {
+int lexProgramExpression(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     if (!iseos(state) && ischr(state, '(')) {
@@ -648,7 +648,7 @@
     return token->len;
 }
 
-int SCPI_LexComma(lex_state_t * state, token_t * token) {
+int lexComma(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     if (skipChr(state, ',')) {
@@ -662,7 +662,7 @@
     return token->len;
 }
 
-int SCPI_LexSemicolon(lex_state_t * state, token_t * token) {
+int lexSemicolon(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     if (skipChr(state, ';')) {
@@ -676,7 +676,7 @@
     return token->len;
 }
 
-int SCPI_LexNewLine(lex_state_t * state, token_t * token) {
+int lexNewLine(lex_state_t * state, token_t * token) {
     token->ptr = state->pos;
 
     skipChr(state, '\r');

--
Gitblit v1.9.1