Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Implements embedding source contents in source maps #591

Merged
merged 7 commits into from
Nov 1, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ install:

after_success:
# exclude some directories from profiling (.libs is from autotools)
- export EXCLUDE_COVERAGE="--exclude sassc --exclude sass-spec --exclude .libs"
- export EXCLUDE_COVERAGE="--exclude sassc --exclude sass-spec \
--exclude .libs --exclude debug.hpp \
--exclude json.cpp --exclude json.hpp \
--exclude cencode.c --exclude b64 \
--exclude utf8 --exclude utf8_string.hpp \
--exclude utf8.h --exclude utf8_string.cpp \
--exclude test"
# debug via gcovr
- gcovr -r .
# debug via coveralls (dump result for futher analyzing)
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ SOURCES = \
functions.cpp \
inspect.cpp \
node.cpp \
json.cpp \
output_compressed.cpp \
output_nested.cpp \
parser.cpp \
Expand All @@ -55,9 +56,10 @@ SOURCES = \
to_string.cpp \
units.cpp \
utf8_string.cpp \
cencode.c \
util.cpp

OBJECTS = $(SOURCES:.cpp=.o)
OBJECTS = $(SOURCES:.cpp=.o) $(SOURCES:.c=.o)

DEBUG_LVL ?= NONE

Expand All @@ -80,7 +82,7 @@ libsass.a: $(OBJECTS)
libsass.so: $(OBJECTS)
$(CXX) -shared $(LDFLAGS) -o $@ $(OBJECTS)

%.o: %.cpp
%.o: %.cpp %.c
$(CXX) $(CXXFLAGS) -c -o $@ $<

%: %.o libsass.a
Expand Down
2 changes: 2 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ libsass_la_SOURCES = \
functions.cpp \
inspect.cpp \
node.cpp \
json.cpp \
output_compressed.cpp \
output_nested.cpp \
parser.cpp \
Expand All @@ -41,6 +42,7 @@ libsass_la_SOURCES = \
to_string.cpp \
units.cpp \
utf8_string.cpp \
cencode.c \
util.cpp

libsass_la_LDFLAGS = -no-undefined -version-info 0:0:0
Expand Down
32 changes: 32 additions & 0 deletions b64/cencode.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
cencode.h - c header for a base64 encoding algorithm

This is part of the libb64 project, and has been placed in the public domain.
For details, see http://sourceforge.net/projects/libb64
*/

#ifndef BASE64_CENCODE_H
#define BASE64_CENCODE_H

typedef enum
{
step_A, step_B, step_C
} base64_encodestep;

typedef struct
{
base64_encodestep step;
char result;
int stepcount;
} base64_encodestate;

void base64_init_encodestate(base64_encodestate* state_in);

char base64_encode_value(char value_in);

int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in);

int base64_encode_blockend(char* code_out, base64_encodestate* state_in);

#endif /* BASE64_CENCODE_H */

77 changes: 77 additions & 0 deletions b64/encode.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
// :mode=c++:
/*
encode.h - c++ wrapper for a base64 encoding algorithm

This is part of the libb64 project, and has been placed in the public domain.
For details, see http://sourceforge.net/projects/libb64
*/
#ifndef BASE64_ENCODE_H
#define BASE64_ENCODE_H

#include <iostream>

namespace base64
{
extern "C"
{
#include "cencode.h"
}

struct encoder
{
base64_encodestate _state;
int _buffersize;

encoder(int buffersize_in = BUFFERSIZE)
: _buffersize(buffersize_in)
{}

int encode(char value_in)
{
return base64_encode_value(value_in);
}

int encode(const char* code_in, const int length_in, char* plaintext_out)
{
return base64_encode_block(code_in, length_in, plaintext_out, &_state);
}

int encode_end(char* plaintext_out)
{
return base64_encode_blockend(plaintext_out, &_state);
}

void encode(std::istream& istream_in, std::ostream& ostream_in)
{
base64_init_encodestate(&_state);
//
const int N = _buffersize;
char* plaintext = new char[N];
char* code = new char[2*N];
int plainlength;
int codelength;

do
{
istream_in.read(plaintext, N);
plainlength = istream_in.gcount();
//
codelength = encode(plaintext, plainlength, code);
ostream_in.write(code, codelength);
}
while (istream_in.good() && plainlength > 0);

codelength = encode_end(code);
ostream_in.write(code, codelength);
//
base64_init_encodestate(&_state);

delete [] code;
delete [] plaintext;
}
};

} // namespace base64

#endif // BASE64_ENCODE_H

109 changes: 109 additions & 0 deletions cencode.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
/*
cencoder.c - c source to a base64 encoding algorithm implementation

This is part of the libb64 project, and has been placed in the public domain.
For details, see http://sourceforge.net/projects/libb64
*/

#include "b64/cencode.h"

const int CHARS_PER_LINE = 72;

void base64_init_encodestate(base64_encodestate* state_in)
{
state_in->step = step_A;
state_in->result = 0;
state_in->stepcount = 0;
}

char base64_encode_value(char value_in)
{
static const char* encoding = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
if (value_in > 63) return '=';
return encoding[(int)value_in];
}

int base64_encode_block(const char* plaintext_in, int length_in, char* code_out, base64_encodestate* state_in)
{
const char* plainchar = plaintext_in;
const char* const plaintextend = plaintext_in + length_in;
char* codechar = code_out;
char result;
char fragment;

result = state_in->result;

switch (state_in->step)
{
while (1)
{
case step_A:
if (plainchar == plaintextend)
{
state_in->result = result;
state_in->step = step_A;
return codechar - code_out;
}
fragment = *plainchar++;
result = (fragment & 0x0fc) >> 2;
*codechar++ = base64_encode_value(result);
result = (fragment & 0x003) << 4;
case step_B:
if (plainchar == plaintextend)
{
state_in->result = result;
state_in->step = step_B;
return codechar - code_out;
}
fragment = *plainchar++;
result |= (fragment & 0x0f0) >> 4;
*codechar++ = base64_encode_value(result);
result = (fragment & 0x00f) << 2;
case step_C:
if (plainchar == plaintextend)
{
state_in->result = result;
state_in->step = step_C;
return codechar - code_out;
}
fragment = *plainchar++;
result |= (fragment & 0x0c0) >> 6;
*codechar++ = base64_encode_value(result);
result = (fragment & 0x03f) >> 0;
*codechar++ = base64_encode_value(result);

++(state_in->stepcount);
if (state_in->stepcount == CHARS_PER_LINE/4)
{
*codechar++ = '\n';
state_in->stepcount = 0;
}
}
}
/* control should not reach here */
return codechar - code_out;
}

int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
{
char* codechar = code_out;

switch (state_in->step)
{
case step_B:
*codechar++ = base64_encode_value(state_in->result);
*codechar++ = '=';
*codechar++ = '=';
break;
case step_C:
*codechar++ = base64_encode_value(state_in->result);
*codechar++ = '=';
break;
case step_A:
break;
}
*codechar++ = '\n';

return codechar - code_out;
}

Loading