Skip to content

Commit

Permalink
Update to nixos-24.05
Browse files Browse the repository at this point in the history
  • Loading branch information
jbboehr committed Jun 20, 2024
1 parent 4f3cfc8 commit 47c6d04
Show file tree
Hide file tree
Showing 12 changed files with 651 additions and 169 deletions.
198 changes: 198 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
---
Language: Cpp
# BasedOnStyle: LLVM
AccessModifierOffset: -2
AlignAfterOpenBracket: BlockIndent
AlignArrayOfStructures: Left
AlignConsecutiveMacros: None
AlignConsecutiveAssignments: None
AlignConsecutiveBitFields: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Right
AlignOperands: Align
AlignTrailingComments: true
AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortEnumsOnASingleLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortLambdasOnASingleLine: None
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
AttributeMacros:
- __capability
- zend_never_inline
- zend_always_inline
- ZEND_COLD
- ZEND_HOT
- PERFIDIOUS_PUBLIC
- PERFIDIOUS_LOCAL
- PERFIDIOUS_ATTR_NONNULL
- PERFIDIOUS_ATTR_NONNULL_ALL
- PERFIDIOUS_ATTR_WARN_UNUSED_RESULT
- PERFIDIOUS_ATTR_RETURNS_NONNULL
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: Never
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
BeforeLambdaBody: false
BeforeWhile: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: true
BreakBeforeBraces: Mozilla
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
QualifierAlignment: Leave
CompactNamespaces: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
DeriveLineEnding: true
DerivePointerAlignment: false
DisableFormat: false
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false
PackConstructorInitializers: Never
BasedOnStyle: ''
ConstructorInitializerAllOnOneLineOrOnePerLine: false
AllowAllConstructorInitializersOnNextLine: true
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IfMacros:
- KJ_IF_MAYBE
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '.*'
Priority: 1
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentAccessModifiers: false
IndentCaseLabels: true
IndentCaseBlocks: false
IndentGotoLabels: true
IndentPPDirectives: None
IndentExternBlock: AfterExternBlock
IndentRequires: false
IndentWidth: 4
IndentWrappedFunctionNames: false
InsertTrailingCommas: Wrapped
KeepEmptyLinesAtTheStartOfBlocks: true
LambdaBodyIndentation: Signature
MacroBlockBegin: "^ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO|ZEND_PARSE_PARAMETERS_START|ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX|ZEND_BEGIN_MODULE_GLOBALS|PHP_INI_BEGIN|ZEND_INI_BEGIN$"
MacroBlockEnd: '^ZEND_END_ARG_INFO|ZEND_PARSE_PARAMETERS_END|ZEND_END_MODULE_GLOBALS|PHP_INI_END|ZEND_INI_END$'
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakOpenParenthesis: 0
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 60
PenaltyIndentedWhitespace: 0
PointerAlignment: Right
PPIndentWidth: -1
ReferenceAlignment: Pointer
ReflowComments: true
RemoveBracesLLVM: false
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 1
SortIncludes: false
SortJavaStaticImport: Before
SortUsingDeclarations: true
SpaceAfterCStyleCast: true
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterIfMacros: true
AfterOverloadedOperator: false
BeforeNonEmptyParentheses: false
SpaceAroundPointerQualifiers: Default
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyBlock: false
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: Never
SpacesInConditionalStatement: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInLineCommentPrefix:
Minimum: 1
Maximum: -1
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
BitFieldColonSpacing: Both
Standard: Latest
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
- PHP_INI_BEGIN
- PHP_INI_END
- ZEND_TSRMLS_CACHE_DEFINE
- ZEND_MOD_END
TabWidth: 4
UseCRLF: false
UseTab: Never
WhitespaceSensitiveMacros:
- STRINGIZE
- PP_STRINGIZE
- BOOST_PP_STRINGIZE
- NS_SWIFT_NAME
- CF_SWIFT_NAME
...

1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
.*project
*~
.deps
.direnv
.dirstamp
.idea
.libs
.pre-commit-config.yaml
autom4te.cache
configure.ac
gmon*
*.a
*.dep
*.la
*.lo
*.log
Expand Down
5 changes: 3 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
* Copyright (c) 2008, Javeline B.V.
* All rights reserved.
* © anno Domini nostri Jesu Christi 2008-2024
* Javeline B.V., John Boehr, & contributors
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
[![GitHub Linux Build Status](https://github.com/jbboehr/php-stemmer/workflows/linux/badge.svg)](https://github.com/jbboehr/php-stemmer/actions?query=workflow%3Alinux)
[![GitHub Docker Build Status](https://github.com/jbboehr/php-stemmer/workflows/docker/badge.svg)](https://github.com/jbboehr/php-stemmer/actions?query=workflow%3Adocker)

This stem extension for PHP provides stemming capability for a variety of
languages using Dr. M.F. Porter's Snowball API. It has a much simpler API
This stem extension for PHP provides stemming capability for a variety of
languages using Dr. M.F. Porter's Snowball API. It has a much simpler API
than the stem extension found in pecl.

This is a cleanup of [php-stemmer](https://code.google.com/p/php-stemmer/).
This is a cleanup of [php-stemmer](https://code.google.com/p/php-stemmer/).
Tests have been added and the bundled libstemmer has been removed. Functions
have been prefixed with the extension name. If you
need features not provided by your system's default version of libstemmer, you
need features not provided by your system's default version of libstemmer, you
can recompile libstemmer for your particular system.

## Installation

### Ubuntu:
### Ubuntu

```bash
sudo apt-get install libstemmer-dev
Expand All @@ -39,4 +39,3 @@ var_dump(stemmer_languages()); # array(...)
## License

This project is licensed under the [New BSD License](http://opensource.org/licenses/BSD-3-Clause).

35 changes: 0 additions & 35 deletions default.nix

This file was deleted.

Loading

0 comments on commit 47c6d04

Please sign in to comment.